diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-12 08:24:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-17 21:39:50 +0200 |
| commit | 09b69024d97356fb660d1162e172ed4f1be7ceae (patch) | |
| tree | 989493bcb49e36f9adbe4096ebf97f8a416ad821 /drivers/net/usb/usbnet.c | |
| parent | Merge branch 'sctp_csum' (diff) | |
| download | linux-09b69024d97356fb660d1162e172ed4f1be7ceae.tar.xz linux-09b69024d97356fb660d1162e172ed4f1be7ceae.zip | |
usbnet: fix error return code in usbnet_probe()
Fix to return -ENOMEM in the padding pkt alloc fail error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index bf94e10a37c8..90a429b7ebad 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1688,8 +1688,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) if (dev->can_dma_sg && !(info->flags & FLAG_SEND_ZLP) && !(info->flags & FLAG_MULTI_PACKET)) { dev->padding_pkt = kzalloc(1, GFP_KERNEL); - if (!dev->padding_pkt) + if (!dev->padding_pkt) { + status = -ENOMEM; goto out4; + } } status = register_netdev (net); |