diff options
| author | Joe Perches <joe@perches.com> | 2013-02-11 09:41:29 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 10:10:33 -0800 |
| commit | 78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b (patch) | |
| tree | 6534f66eb765163602ad1af98c651bea6ae09416 /drivers/staging/gdm72xx/usb_boot.c | |
| parent | ad463ac42771a0bb8a706cf8a985788fe5f5c1c6 (diff) | |
staging: Remove unnecessary OOM messages
alloc failures already get standardized OOM
messages and a dump_stack.
For the affected mallocs around these OOM messages:
Converted kzallocs with multiplies to kcalloc.
Converted kmallocs with multiplies to kmalloc_array.
Converted a kmalloc/strlen/strncpy to kstrdup.
Moved a spin_lock below a removed OOM message and
removed a now unnecessary spin_unlock.
Neatened alignment and whitespace.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm72xx/usb_boot.c')
| -rw-r--r-- | drivers/staging/gdm72xx/usb_boot.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c index 3e2103ae4ea..0d45eb680be 100644 --- 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); |