diff options
| author | Wolfram Sang <wsa-dev@sang-engineering.com> | 2016-08-25 19:39:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-30 19:17:39 +0200 |
| commit | e5cdac9242f58ca0122822e8fd7cab03c7faeb07 (patch) | |
| tree | ba2b12fec3a7e9cd99b6eb7cb020f75cb2998e4f /drivers/usb/storage/alauda.c | |
| parent | c34515f87501fc1cb49ec1a104b9a69e4a263e80 (diff) | |
| download | linux-e5cdac9242f58ca0122822e8fd7cab03c7faeb07.tar.gz linux-e5cdac9242f58ca0122822e8fd7cab03c7faeb07.tar.bz2 linux-e5cdac9242f58ca0122822e8fd7cab03c7faeb07.zip | |
usb: storage: alauda: don't print on ENOMEM
All kmalloc-based functions print enough information on failures.
Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage/alauda.c')
| -rw-r--r-- | drivers/usb/storage/alauda.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index 1d8b03c81030..878b4b8761f5 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c @@ -939,10 +939,8 @@ static int alauda_read_data(struct us_data *us, unsigned long address, len = min(sectors, blocksize) * (pagesize + 64); buffer = kmalloc(len, GFP_NOIO); - if (buffer == NULL) { - printk(KERN_WARNING "alauda_read_data: Out of memory\n"); + if (!buffer) return USB_STOR_TRANSPORT_ERROR; - } /* Figure out the initial LBA and page */ lba = address >> blockshift; @@ -1033,18 +1031,15 @@ static int alauda_write_data(struct us_data *us, unsigned long address, len = min(sectors, blocksize) * pagesize; buffer = kmalloc(len, GFP_NOIO); - if (buffer == NULL) { - printk(KERN_WARNING "alauda_write_data: Out of memory\n"); + if (!buffer) return USB_STOR_TRANSPORT_ERROR; - } /* * We also need a temporary block buffer, where we read in the old data, * overwrite parts with the new data, and manipulate the redundancy data */ blockbuffer = kmalloc((pagesize + 64) * blocksize, GFP_NOIO); - if (blockbuffer == NULL) { - printk(KERN_WARNING "alauda_write_data: Out of memory\n"); + if (!blockbuffer) { kfree(buffer); return USB_STOR_TRANSPORT_ERROR; } |