lkml.org 
[lkml]   [2009]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [PATCH] staging: fix a silly typo
Date
On Tue, 1 Dec 2009 03:29:18 am Greg KH wrote:
> On Mon, Nov 30, 2009 at 04:39:37PM +0000, Alan Cox wrote:
> > Well given Rusty has vanished can you apply it to staging and rusty can
> > fix his tree up when he returns, assuming patch doesn't fix it for him.
>
> The patch does not apply to my tree at all, the problem is caused by
> stuff done only in Rusty's tree. He has changed the code here to be
> broken, not me, so there's really nothing I can do about it.
>
> Stephen could apply it to linux-next though.

I missed linux-next for today, but sfr offered to apply it manually:

From: Alan Cox <alan@linux.intel.com>
Subject: [PATCH] staging: fix a silly typo

(Resend #3)

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

drivers/staging/rtl8187se/r8180_core.c | 2 +-
drivers/staging/rtl8192su/r8192U_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 5a6cd60..d74bf70 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Andrea Merello <andreamrl@tiscali.it>");
MODULE_DESCRIPTION("Linux driver for Realtek RTL8180 / RTL8185 WiFi cards");


-module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
+module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR);
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index e24815f..0a052ea 100644
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -142,7 +142,7 @@ static int channels = 0x3fff;



-module_param_string(ifname, ifname, sizef(ifname), S_IRUGO|S_IWUSR);
+module_param_string(ifname, ifname, sizeof(ifname), S_IRUGO|S_IWUSR);
//module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
module_param(hwwep,int, S_IRUGO|S_IWUSR);
module_param(channels,int, S_IRUGO|S_IWUSR);


\
 
 \ /
  Last update: 2009-12-01 03:09    [W:0.037 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site