Commit acfa5110 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman

Staging: w35und: fix usb_control_msg() error handling in wb35_probe()

If successful, the usb_control_msg() function returns the number of
bytes transferred. Fix up wb35_probe() to only bail out if the function returns
a negative number. Also, fix up ieee80211_alloc_hw() error code to ENOMEM;
otherwise GCC complains that err might be undefined (and is right about that).
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Reported-and-tested-by: default avatarSandro Bonazzola <sandro.bonazzola@gmail.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 05e361ca
...@@ -319,16 +319,18 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id ...@@ -319,16 +319,18 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
struct wbsoft_priv *priv; struct wbsoft_priv *priv;
struct ieee80211_hw *dev; struct ieee80211_hw *dev;
int err; int nr, err;
usb_get_dev(udev); usb_get_dev(udev);
// 20060630.2 Check the device if it already be opened // 20060630.2 Check the device if it already be opened
err = usb_control_msg(udev, usb_rcvctrlpipe( udev, 0 ), nr = usb_control_msg(udev, usb_rcvctrlpipe( udev, 0 ),
0x01, USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN, 0x01, USB_TYPE_VENDOR|USB_RECIP_DEVICE|USB_DIR_IN,
0x0, 0x400, &ltmp, 4, HZ*100 ); 0x0, 0x400, &ltmp, 4, HZ*100 );
if (err) if (nr < 0) {
err = nr;
goto error; goto error;
}
ltmp = cpu_to_le32(ltmp); ltmp = cpu_to_le32(ltmp);
if (ltmp) { // Is already initialized? if (ltmp) { // Is already initialized?
...@@ -337,8 +339,10 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id ...@@ -337,8 +339,10 @@ static int wb35_probe(struct usb_interface *intf, const struct usb_device_id *id
} }
dev = ieee80211_alloc_hw(sizeof(*priv), &wbsoft_ops); dev = ieee80211_alloc_hw(sizeof(*priv), &wbsoft_ops);
if (!dev) if (!dev) {
err = -ENOMEM;
goto error; goto error;
}
priv = dev->priv; priv = dev->priv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment