diff options
Diffstat (limited to 'drivers/net/usb/asix.c')
| -rw-r--r-- | drivers/net/usb/asix.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 1249f444039..6f245cfb662 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -33,8 +33,7 @@ #include <linux/mii.h> #include <linux/usb.h> #include <linux/crc32.h> - -#include "usbnet.h" +#include <linux/usb/usbnet.h> #define DRIVER_VERSION "14-Jun-2006" static const char driver_name [] = "asix"; @@ -202,10 +201,10 @@ static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, buf, size, USB_CTRL_GET_TIMEOUT); - if (err >= 0 && err < size) - err = -EINVAL; - if (!err) + if (err == size) memcpy(data, buf, size); + else if (err >= 0) + err = -EINVAL; kfree(buf); out: |