staging/winbond: use err and remove nr
authorDevendra Naga <devendra.aaru@gmail.com>
Sat, 14 Jul 2012 07:40:37 +0000 (13:25 +0545)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jul 2012 02:21:37 +0000 (19:21 -0700)
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.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/winbond/wbusb.c

index c3751a7..ef36054 100644 (file)
@@ -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);