diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2010-09-11 05:39:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-13 20:02:52 -0700 |
| commit | 7dbfdc2390afc4e244817ab26d5a1b987b0c0669 (patch) | |
| tree | d423a8cf8dfab4c705a7d6f3ad4e41b5e76b1ca8 /drivers/net/usb | |
| parent | d81e27cf4e2a5050245f9962539292ea2c9e2206 (diff) | |
| download | blackbird-op-linux-7dbfdc2390afc4e244817ab26d5a1b987b0c0669.tar.gz blackbird-op-linux-7dbfdc2390afc4e244817ab26d5a1b987b0c0669.zip | |
cx82310_eth: check usb_string() return value for error
Fix that usb_string() return value is not checked for error (negative value).
Also change the ignore message a bit and lower its level to info.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/cx82310_eth.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c index 6fbe03276b27..4d451789ea7c 100644 --- a/drivers/net/usb/cx82310_eth.c +++ b/drivers/net/usb/cx82310_eth.c @@ -138,11 +138,9 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf) struct usb_device *udev = dev->udev; /* avoid ADSL modems - continue only if iProduct is "USB NET CARD" */ - if (udev->descriptor.iProduct && - usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) && - strcmp(buf, "USB NET CARD")) { - dev_err(&udev->dev, - "probably an ADSL modem, use cxacru driver instead\n"); + if (usb_string(udev, udev->descriptor.iProduct, buf, sizeof(buf)) > 0 + && strcmp(buf, "USB NET CARD")) { + dev_info(&udev->dev, "ignoring: probably an ADSL modem\n"); return -ENODEV; } |
