Merge remote-tracking branch 'spi/topic/build' into spi-next

[~andy/linux] / drivers / staging / gdm72xx / usb_boot.c

diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index 3e2103ae4eaefdeb66a6ebc58450fff28d037173..0d45eb680be51ff23bed9ba853d0cbf0c1479656 100644 (file)
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -158,10 +158,8 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
        }
 
        tx_buf = kmalloc(DOWNLOAD_SIZE, GFP_KERNEL);
-       if (tx_buf == NULL) {
-               dev_err(&usbdev->dev, "Error: kmalloc\n");
+       if (tx_buf == NULL)
                return -ENOMEM;
-       }
 
        if (firm->size < sizeof(hdr)) {
                dev_err(&usbdev->dev, "Cannot read the image info.\n");
@@ -301,10 +299,8 @@ static int em_download_image(struct usb_device *usbdev, const char *img_name,
        }
 
        buf = kmalloc(DOWNLOAD_CHUCK + pad_size, GFP_KERNEL);
-       if (buf == NULL) {
-               dev_err(&usbdev->dev, "Error: kmalloc\n");
+       if (buf == NULL)
                return -ENOMEM;
-       }
 
        strcpy(buf+pad_size, type_string);
        ret = gdm_wibro_send(usbdev, buf, strlen(type_string)+pad_size);