Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into...

[~andy/linux] / drivers / net / wireless / zd1201.c

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index b8ba1f925e75521a2886b42a8a3d95dac69c0aa9..d39c4178c33a61b3291958904c74f03a754f47a3 100644 (file)
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -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;
@@ -1764,8 +1766,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);