diff --git a/[refs] b/[refs]
index 1f6e0767e278..dcd93f73e295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9b9f93426139e7525306b94df8f82989c3f6138
+refs/heads/master: caa20de81635b567ee0114a81ffbbffb3085d727
diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c
index 0e27fb1d9640..d6c969a65cf8 100644
--- a/trunk/drivers/staging/vt6656/iwctl.c
+++ b/trunk/drivers/staging/vt6656/iwctl.c
@@ -856,8 +856,7 @@ int iwctl_siwessid(struct net_device *dev,
 /*
  * Wireless Handler : get essid
  */
-
-int iwctl_giwessid(struct net_device *dev,
+void iwctl_giwessid(struct net_device *dev,
              struct iw_request_info *info,
              struct iw_point *wrq,
              char *extra)
@@ -879,8 +878,6 @@ int iwctl_giwessid(struct net_device *dev,
 
         wrq->length = pItemSSID->len;
 	wrq->flags = 1; // active
-
-	return 0;
 }
 
 /*
diff --git a/trunk/drivers/staging/vt6656/iwctl.h b/trunk/drivers/staging/vt6656/iwctl.h
index 22acf8be8e7c..0bab0d755c5e 100644
--- a/trunk/drivers/staging/vt6656/iwctl.h
+++ b/trunk/drivers/staging/vt6656/iwctl.h
@@ -97,7 +97,7 @@ int iwctl_siwessid(struct net_device *dev,
              struct iw_point *wrq,
              char *extra);
 
-int iwctl_giwessid(struct net_device *dev,
+void iwctl_giwessid(struct net_device *dev,
              struct iw_request_info *info,
              struct iw_point *wrq,
              char *extra);
diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c
index 6213075030dc..91b953cb6d36 100644
--- a/trunk/drivers/staging/vt6656/main_usb.c
+++ b/trunk/drivers/staging/vt6656/main_usb.c
@@ -1657,8 +1657,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 		{
 			char essid[IW_ESSID_MAX_SIZE+1];
 			if (wrq->u.essid.pointer) {
-				rc = iwctl_giwessid(dev, NULL,
-						    &(wrq->u.essid), essid);
+				iwctl_giwessid(dev, NULL,
+					    &(wrq->u.essid), essid);
 				if (copy_to_user(wrq->u.essid.pointer,
 						         essid,
 						         wrq->u.essid.length) )