From b045dbfe86d8d7ffdc3af52511c96a4d1a067521 Mon Sep 17 00:00:00 2001 From: d binderman Date: Tue, 26 Jan 2010 10:00:25 +0000 Subject: [PATCH] --- yaml --- r: 186721 b: refs/heads/master c: e501b36bdf85212d537b30babf60dfedf3fdcebd h: refs/heads/master i: 186719: c372d71ace6407209aba2d4caf5949b436a93c86 v: v3 --- [refs] | 2 +- trunk/drivers/staging/otus/ioctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8c8565de566f..b77b31765f95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 411a861fc4f92cf0f5039928b448dcc7ca31d423 +refs/heads/master: e501b36bdf85212d537b30babf60dfedf3fdcebd diff --git a/trunk/drivers/staging/otus/ioctl.c b/trunk/drivers/staging/otus/ioctl.c index ebaedb7b1688..8c47b1a68627 100644 --- a/trunk/drivers/staging/otus/ioctl.c +++ b/trunk/drivers/staging/otus/ioctl.c @@ -866,15 +866,15 @@ int usbdrvwext_giwscan(struct net_device *dev, char *current_ev = extra; char *end_buf; int i; - /* struct zsBssList BssList; */ - struct zsBssListV1 *pBssList = kmalloc(sizeof(struct zsBssListV1), - GFP_KERNEL); /* BssList = wd->sta.pBssList; */ /* zmw_get_wlan_dev(dev); */ if (macp->DeviceOpened != 1) return 0; + /* struct zsBssList BssList; */ + struct zsBssListV1 *pBssList = kmalloc(sizeof(struct zsBssListV1), + GFP_KERNEL); if (data->length == 0) end_buf = extra + IW_SCAN_MAX_DATA; else