Skip to contentSkip to conversation

staging/winbond: use err and remove nr

PATCH New Devendra Naga 1 participant 1 message Jul 14, 2012 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging/winbond: use err and remove nr

err can be used get return status of the usb_control_msg, rather using nr and assigning it to err when the function returns error.

---
 drivers/staging/winbond/wbusb.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/staging/winbond/wbusb.c +3 -5
index c3751a7..ef36054 100644
@@ -747,20 +747,18 @@ static int wb35_probe(struct usb_interface *intf,
 	struct usb_host_interface *interface;
 	struct ieee80211_hw *dev;
 	struct wbsoft_priv *priv;
-	int nr, err;
+	int err;
 	u32 ltmp;
 
 	usb_get_dev(udev);
 
 	/* Check the device if it already be opened */
-	nr = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+	err = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
 			     0x01,
 			     USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
 			     0x0, 0x400, &ltmp, 4, HZ * 100);
-	if (nr < 0) {
-		err = nr;
+	if (err < 0)
 		goto error;
-	}
 
 	/* Is already initialized? */
 	ltmp = cpu_to_le32(ltmp);
Signature · 1 line
1.7.9.5