diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 21:11:29 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 21:11:29 +0200 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /drivers/net/wireless/prism54/isl_ioctl.c | |
| parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
| parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'drivers/net/wireless/prism54/isl_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index d97a2caf582b..bc2ba80c47bb 100644 --- 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); |