[PATCH] staging/lustre: remove Peng Tao from Lustre contact list
I am leaving emc for a new company where I cannot have much time working on Lustre. So remove myself from the contact list. I will still be around and continue to contribute as a hobbyist though. Cc: Greg Kroah-Hartman Cc: Andreas Dilger Cc: Oleg Drokin Signed-off-by: Peng Tao --- drivers/staging/lustre/TODO |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/lustre/TODO b/drivers/staging/lustre/TODO index 0a2b6cb..e325e1e 100644 --- a/drivers/staging/lustre/TODO +++ b/drivers/staging/lustre/TODO @@ -9,6 +9,5 @@ * Other minor misc cleanups... Please send any patches to Greg Kroah-Hartman , Andreas Dilger -, Oleg Drokin and -Peng Tao . CCing hpdd-discuss -would be great too. +, Oleg Drokin . CCing +hpdd-discuss would be great too. -- 1.7.9.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: comedi: ii_pci20kc: fix usage of uninit scalar in ii20k_attach()
On 04/05/14 01:26, Christian Engelmayer wrote:
This driver supports the PCI-20001C-1a and PCI-20001C-2a carrier boards.
The -2a version has 32 on-board DIO channels. In case this variant is
detected, local variable 'has_dio' is set accordingly. Otherwise it is
left uninitialized and the following subdevice instantiation depends on
the stack. Detected by Coverity - CID 1077830.
Signed-off-by: Christian Engelmayer
---
Compile tested and applies against branch staging-next of tree
git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
---
drivers/staging/comedi/drivers/ii_pci20kc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c
b/drivers/staging/comedi/drivers/ii_pci20kc.c
index 3558ab3..2516ce8 100644
--- a/drivers/staging/comedi/drivers/ii_pci20kc.c
+++ b/drivers/staging/comedi/drivers/ii_pci20kc.c
@@ -461,6 +461,7 @@ static int ii20k_attach(struct comedi_device *dev,
id = readb(devpriv->ioaddr + II20K_ID_REG);
switch (id & II20K_ID_MASK) {
case II20K_ID_PCI20001C_1A:
+ has_dio = false;
break;
case II20K_ID_PCI20001C_2A:
has_dio = true;
Thanks¬
Reviewed-by: Ian Abbott
--
-=( Ian Abbott @ MEV Ltd.E-mail: )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: rtl8821ae: mark pci_mem_start (and _end) as __iomem
Shared addresses can be marked as such.
Signed-off-by: Martin Kepplinger
---
I guess that's what you meant. Thanks for your feedback!
drivers/staging/rtl8821ae/wifi.h |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8821ae/wifi.h b/drivers/staging/rtl8821ae/wifi.h
index 17a9d9f..d162730 100644
--- a/drivers/staging/rtl8821ae/wifi.h
+++ b/drivers/staging/rtl8821ae/wifi.h
@@ -1086,8 +1086,8 @@ struct rtl_io {
struct device *dev;
/*PCI MEM map */
- unsigned long pci_mem_end; /*shared mem end*/
- unsigned long pci_mem_start;/*shared mem start */
+ unsigned long __iomem pci_mem_end; /*shared mem end */
+ unsigned long __iomem pci_mem_start;/*shared mem start */
/*PCI IO map */
unsigned long pci_base_addr;/*device I/O address */
--
1.7.10.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: Found some errors and other oddities, largely by means of a static code analysis program
Hi
Thanks for your replies, I've included the changes you suggested in my patch.
Although I guess functionality r8712_set_key () is already done then.
I have also received several complaints already on the patch is not
broken down by the type of errors they contain, and that this is
clearly described in the commit message.
Will try to fix this, but I have done this type of change in a little
over 100 files so do not know when I'm done with this :-(
Best regards
Rickard Strandqvist
2014-05-03 22:35 GMT+02:00 Christian Engelmayer :
> On Sat, 3 May 2014 23:06:50 +0300, Dan Carpenter
> wrote:
>> Many of my other comments apply.
>>
>> > diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>> > b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>> > index 23d539d..1d4475d 100644
>> > --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>> > +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
>
>
>> > max_rate *= 2; /* Mbps/2 */
>> > @@ -1822,6 +1814,7 @@ static int r871x_wx_set_enc_ext(struct net_device
>> > *dev,
>> > alg_name = "CCMP";
>> > break;
>> > default:
>> > + kfree(param);
>> > return -EINVAL;
>>
>> Good. But this belongs in a separate patch.
>>
>
> There's a patch proposal from 2014-05-01 this week that addresses this issue,
> see "[PATCH] staging: rtl8712: fix potential leak in r871x_wx_set_enc_ext()"
>
>> > }
>> > strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN);
>> > diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c
>> > b/drivers/staging/rtl8712/rtl871x_mlme.c
>> > index 3ea99ae..f126763 100644
>> > --- a/drivers/staging/rtl8712/rtl871x_mlme.c
>> > +++ b/drivers/staging/rtl8712/rtl871x_mlme.c
>> > @@ -1274,22 +1274,30 @@ sint r8712_set_key(struct _adapter *adapter,
>> > psecuritypriv->DefKey[keyid].skey, keylen);
>> > break;
>> > case _TKIP_:
>> > - if (keyid < 1 || keyid > 2)
>> > + if (keyid < 1 || keyid > 2) {
>> > + kfree((unsigned char *)pcmd);
>> > + kfree((unsigned char *)psetkeyparm);
>> > return _FAIL;
>>
>> The cast is wrong and anyway it's not needed. This should be:
>>
>> ret = _FAIL;
>> goto err_free_keyparm;
>>
>
> same here, see "[PATCH] staging: rtl8712: fix potential leaks in
> r8712_set_key()".
>
> Regards,
> Christian
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: et131x: add blank lines after declarations
Signed-off-by: Maarten de Jonge
---
drivers/staging/et131x/et131x.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index d329cf3..747fd9a 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -762,6 +762,7 @@ static int et131x_init_eeprom(struct et131x_adapter
*adapter)
*/
if (eestatus & 0x4C) {
int write_failed = 0;
+
if (pdev->revision == 0x01) {
int i;
static const u8 eedata[4] = { 0xFE, 0x13, 0x10, 0xFF };
@@ -2091,6 +2092,7 @@ static void et1310_disable_phy_coma(struct et131x_adapter
*adapter)
static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)
{
u32 tmp_free_buff_ring = *free_buff_ring;
+
tmp_free_buff_ring++;
/* This works for all cases where limit < 1024. The 1023 case
* works because 1023++ is 1024 which means the if condition is not
--
1.9.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/6] staging: comedi: addi_apci_1564: remove eeprom support code
On Sat, May 3, 2014 at 6:52 PM, Greg KH wrote: > On Mon, Apr 28, 2014 at 12:40:05PM +0300, Dan Carpenter wrote: >> Nice, Chase, you've become an expert on comedi, it seems. >> >> I can't say how happy comedi patches make me these days. Ian, you and >> Hartley are doing a fantastic job. > > Same here, it's great to see all of this cleanup happening. Maybe > someday it can move out of staging... :) Thanks everyone! :) Yeah, I suppose it would be nice to see comedi graduate, eh? AFAICT, it looks like it's been hanging around in staging a while... Thanks, Chase ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: vt6655: correct coding style issue
Remove C99 comment and rewrite lines over 80 characters. Warnings and error found by checkpatch.pl script. Signed-off-by: Clément Calmels --- drivers/staging/vt6655/tmacro.h | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/tmacro.h b/drivers/staging/vt6655/tmacro.h index 59c6e72..264c6ed 100644 --- a/drivers/staging/vt6655/tmacro.h +++ b/drivers/staging/vt6655/tmacro.h @@ -44,17 +44,22 @@ #define LOWORD(d) ((unsigned short)(d)) #endif #if !defined(HIWORD) -#define HIWORD(d) ((unsigned short)unsigned long)(d)) >> 16) & 0x)) +#define HIWORD(d) \ + ((unsigned short)unsigned long)(d)) >> 16) & 0x)) #endif #define LODWORD(q) ((q).u.dwLowDword) #define HIDWORD(q) ((q).u.dwHighDword) #if !defined(MAKEWORD) -#define MAKEWORD(lb, hb)((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8))) +#define MAKEWORD(lb, hb)\ + ((unsigned short)(((unsigned char)(lb)) \ + | (((unsigned short)((unsigned char)(hb))) << 8))) #endif #if !defined(MAKEDWORD) -#define MAKEDWORD(lw, hw) ((unsigned long)(((unsigned short)(lw)) | (((unsigned long)((unsigned short)(hw))) << 16))) +#define MAKEDWORD(lw, hw)\ + ((unsigned long)(((unsigned short)(lw)) \ +| (((unsigned long)((unsigned short)(hw))) << 16))) #endif -#endif // __TMACRO_H__ +#endif /* __TMACRO_H__ */ -- 2.0.0.rc0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: vt6655: correct coding style issue
On Sun, May 04, 2014 at 09:52:09PM +0200, Clément Calmels wrote: > Remove C99 comment and rewrite lines over 80 characters. > Warnings and error found by checkpatch.pl script. > > Signed-off-by: Clément Calmels > --- > drivers/staging/vt6655/tmacro.h | 13 + > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/vt6655/tmacro.h b/drivers/staging/vt6655/tmacro.h > index 59c6e72..264c6ed 100644 > --- a/drivers/staging/vt6655/tmacro.h > +++ b/drivers/staging/vt6655/tmacro.h > @@ -44,17 +44,22 @@ > #define LOWORD(d) ((unsigned short)(d)) > #endif > #if !defined(HIWORD) > -#define HIWORD(d) ((unsigned short)unsigned long)(d)) >> 16) & > 0x)) > +#define HIWORD(d)\ > + ((unsigned short)unsigned long)(d)) >> 16) & 0x)) > #endif > > #define LODWORD(q) ((q).u.dwLowDword) > #define HIDWORD(q) ((q).u.dwHighDword) > > #if !defined(MAKEWORD) > -#define MAKEWORD(lb, hb)((unsigned short)(((unsigned char)(lb)) | > (((unsigned short)((unsigned char)(hb))) << 8))) > +#define MAKEWORD(lb, hb)\ > + ((unsigned short)(((unsigned char)(lb)) \ > + | (((unsigned short)((unsigned char)(hb))) << 8))) > #endif > #if !defined(MAKEDWORD) > -#define MAKEDWORD(lw, hw) ((unsigned long)(((unsigned short)(lw)) | > (((unsigned long)((unsigned short)(hw))) << 16))) > +#define MAKEDWORD(lw, hw)\ > + ((unsigned long)(((unsigned short)(lw)) \ > + | (((unsigned long)((unsigned short)(hw))) << 16))) > #endif > > -#endif // __TMACRO_H__ > +#endif /* __TMACRO_H__ */ Why not just switch to use the built-in macros the kernel provides for this? greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: lustre: return -EFAULT instead of bytes remaining
Sure - resent as v2 yesterday. Regards, Vitaly On Sun, May 4, 2014 at 9:31 AM, Greg Kroah-Hartman wrote: > On Sun, Apr 27, 2014 at 01:02:03AM +1000, Vitaly Osipov wrote: >> return -EFAULT instead of the value returned by copy_from_user() >> >> Signed-off-by: Vitaly Osipov >> --- >> .../lustre/lustre/libcfs/linux/linux-module.c | 11 --- > > This patch doesn't apply at all, can you refresh it against my latest > tree and resend? > > thanks, > > greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
