diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /drivers/net/wireless/ray_cs.c | |
| parent | 78c210efdefe07131f91ed512a3308b15bb14e2f (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8' into HEAD
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; |