From 09c53a956f6eab3b11848b131c5110469ad6932a Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.mage@gmail.com>
Date: Wed, 28 Dec 2011 21:09:13 +0000
Subject: [PATCH] --- yaml --- r: 288984 b: refs/heads/master c:
 5d11b1737d52b6f9428c2daea72457cd477e0122 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/vt6656/iwctl.c    | 4 +---
 trunk/drivers/staging/vt6656/iwctl.h    | 2 +-
 trunk/drivers/staging/vt6656/main_usb.c | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 670a674a2f5d..f9fbfb45a959 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 506215ba22fea4a9190b7e33413405bd4d4ab1e1
+refs/heads/master: 5d11b1737d52b6f9428c2daea72457cd477e0122
diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c
index d6fd0105bf9e..75b36d3bf1ae 100644
--- a/trunk/drivers/staging/vt6656/iwctl.c
+++ b/trunk/drivers/staging/vt6656/iwctl.c
@@ -471,7 +471,7 @@ int iwctl_siwmode(struct net_device *dev,
  * Wireless Handler : get operation mode
  */
 
-int iwctl_giwmode(struct net_device *dev,
+void iwctl_giwmode(struct net_device *dev,
              struct iw_request_info *info,
              __u32 *wmode,
              char *extra)
@@ -498,8 +498,6 @@ int iwctl_giwmode(struct net_device *dev,
 	default:
 		*wmode = IW_MODE_ADHOC;
 	}
-
-	return 0;
 }
 
 
diff --git a/trunk/drivers/staging/vt6656/iwctl.h b/trunk/drivers/staging/vt6656/iwctl.h
index 10a240e65012..60180a75f30d 100644
--- a/trunk/drivers/staging/vt6656/iwctl.h
+++ b/trunk/drivers/staging/vt6656/iwctl.h
@@ -52,7 +52,7 @@ int iwctl_giwrange(struct net_device *dev,
              char *extra);
 
 
-int iwctl_giwmode(struct net_device *dev,
+void iwctl_giwmode(struct net_device *dev,
              struct iw_request_info *info,
              __u32 *wmode,
              char *extra);
diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c
index 6a708f447651..fdd35c6af1c0 100644
--- a/trunk/drivers/staging/vt6656/main_usb.c
+++ b/trunk/drivers/staging/vt6656/main_usb.c
@@ -1733,7 +1733,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 
 		// Get mode of operation
 	case SIOCGIWMODE:
-		rc = iwctl_giwmode(dev, NULL, &(wrq->u.mode), NULL);
+		iwctl_giwmode(dev, NULL, &(wrq->u.mode), NULL);
 		break;
 
 		// Set WEP keys and mode