From 9c701d8aac9e2177f11611d3a483fb8dc74d6643 Mon Sep 17 00:00:00 2001
From: Pranith Kumar <pranith.hacks@gmail.com>
Date: Mon, 8 Jun 2009 13:38:26 +0530
Subject: [PATCH] --- yaml --- r: 161995 b: refs/heads/master c:
 4a5629b92ee530e7c3077689d5efb90be613a9a5 h: refs/heads/master i:   161993:
 2952f2b9685b577b18ba3f27ab77c088cb7c562a   161991:
 80250c8b7e5d7da27ae758e216a0b03d307fc6c1 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/otus/ioctl.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9e3e9da62b40..056fef9341b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c47b34cd6c62cb4cf9fb8f873aeb99b6cc60b4d
+refs/heads/master: 4a5629b92ee530e7c3077689d5efb90be613a9a5
diff --git a/trunk/drivers/staging/otus/ioctl.c b/trunk/drivers/staging/otus/ioctl.c
index ce04218253dd..dd327056f120 100644
--- a/trunk/drivers/staging/otus/ioctl.c
+++ b/trunk/drivers/staging/otus/ioctl.c
@@ -2045,6 +2045,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
 	struct zsKeyInfo keyInfo;
 	struct usbdrv_private *macp = dev->ml_priv;
 	u16_t vapId = 0;
+	int ii;
 
 	/* zmw_get_wlan_dev(dev); */
 
@@ -2168,7 +2169,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
 		/* DUMP key context */
 		/* #ifdef WPA_DEBUG */
 		if (keyInfo.keyLength > 0) {
-			int ii;
 			printk(KERN_WARNING
 						"Otus: Key Context:\n");
 			for (ii = 0; ii < keyInfo.keyLength; ) {
@@ -2266,7 +2266,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
 		/* zfiWlanSetWpaIe(dev, zdparm->u.generic_elem.data,
 		* zdparm->u.generic_elem.len);
 		*/
-		int ii;
 		u8_t len = zdparm->u.generic_elem.len;
 		u8_t *wpaie = (u8_t *)zdparm->u.generic_elem.data;
 
@@ -2401,7 +2400,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	struct athr_wlan_param zdparm;
 	struct usbdrv_private *macp = dev->ml_priv;
 
-	int err = 0;
+	int err = 0, val = 0;
 	int changed = 0;
 
 	/* regp = macp->regp; */
@@ -2445,7 +2444,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 			err = -EPERM;
 			break;
 		}
-		int val = *((int *) wrq->u.name);
+		val = *((int *) wrq->u.name);
 		if ((val < 0) || (val > 2)) {
 			err = -EINVAL;
 			break;