projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'orion/devel' into next/devel
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
prism54
/
isl_ioctl.c
diff --git
a/drivers/net/wireless/prism54/isl_ioctl.c
b/drivers/net/wireless/prism54/isl_ioctl.c
index
d97a2ca
..
bc2ba80
100644
(file)
--- a/
drivers/net/wireless/prism54/isl_ioctl.c
+++ b/
drivers/net/wireless/prism54/isl_ioctl.c
@@
-778,7
+778,7
@@
prism54_get_essid(struct net_device *ndev, struct iw_request_info *info,
dwrq->flags = 0;
dwrq->length = 0;
}
- essid->octets[
essid
->length] = '\0';
+ essid->octets[
dwrq
->length] = '\0';
memcpy(extra, essid->octets, dwrq->length);
kfree(essid);