diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 15:51:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 15:51:21 -0500 |
| commit | a6c872afb2536f47285e6643f4629dec7520041d (patch) | |
| tree | 4b54e69fc6594f9afc1277520a350db04e578e77 /drivers/net/wireless/ray_cs.c | |
| parent | 9fe02668fe48a1d546196bc1392330ff28d9bd57 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 88cd58eb3b9f..1c88c2ea59aa 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -2879,7 +2879,7 @@ static int write_essid(struct file *file, const char __user *buffer, | |||
| 2879 | unsigned long count, void *data) | 2879 | unsigned long count, void *data) |
| 2880 | { | 2880 | { |
| 2881 | static char proc_essid[33]; | 2881 | static char proc_essid[33]; |
| 2882 | int len = count; | 2882 | unsigned int len = count; |
| 2883 | 2883 | ||
| 2884 | if (len > 32) | 2884 | if (len > 32) |
| 2885 | len = 32; | 2885 | len = 32; |