zd1201: fix error return code
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 26 Aug 2013 07:32:01 +0000 (15:32 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 26 Aug 2013 18:10:39 +0000 (14:10 -0400)
Fix to return -ENOMEM in the memory alloc error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/zd1201.c

index 4941f201d6c8dc5a4b62446a9153a4384a3cb4f4..73aa7388dd2b7764fe11d1508677747676270fbc 100644 (file)
@@ -75,8 +75,10 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
         len = fw_entry->size;
 
        buf = kmalloc(1024, GFP_ATOMIC);
-       if (!buf)
+       if (!buf) {
+               err = -ENOMEM;
                goto exit;
+       }
        
        while (len > 0) {
                int translen = (len > 1024) ? 1024 : len;
@@ -1762,8 +1764,10 @@ static int zd1201_probe(struct usb_interface *interface,
        zd->endp_out2 = 2;
        zd->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
        zd->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
-       if (!zd->rx_urb || !zd->tx_urb)
+       if (!zd->rx_urb || !zd->tx_urb) {
+               err = -ENOMEM;
                goto err_zd;
+       }
 
        mdelay(100);
        err = zd1201_drvr_start(zd);