lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: storage: sddr09: don't print on ENOMEM

Browse Source 
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>
This commit is contained in:
Wolfram Sang
2016-08-25 19:39:32 +02:00
committed by Greg Kroah-Hartman
parent e5cdac9242
commit fd233925ed
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/storage/sddr09.c
View File

@@ -766,10 +766,8 @@ sddr09_read_data(struct us_data *us,
len = min(sectors, (unsigned int) info->blocksize) * info->pagesize; len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
buffer = kmalloc(len, GFP_NOIO); buffer = kmalloc(len, GFP_NOIO);
if (buffer == NULL) { if (!buffer)
printk(KERN_WARNING "sddr09_read_data: Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
// This could be made much more efficient by checking for // This could be made much more efficient by checking for
// contiguous LBA's. Another exercise left to the student. // contiguous LBA's. Another exercise left to the student.
@@ -1004,10 +1002,8 @@ sddr09_write_data(struct us_data *us,
pagelen = (1 << info->pageshift) + (1 << CONTROL_SHIFT); pagelen = (1 << info->pageshift) + (1 << CONTROL_SHIFT);
blocklen = (pagelen << info->blockshift); blocklen = (pagelen << info->blockshift);
blockbuffer = kmalloc(blocklen, GFP_NOIO); blockbuffer = kmalloc(blocklen, GFP_NOIO);
if (!blockbuffer) { if (!blockbuffer)
printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
return -ENOMEM; return -ENOMEM;
}
/* /*
* Since we don't write the user data directly to the device, * Since we don't write the user data directly to the device,
@@ -1017,8 +1013,7 @@ sddr09_write_data(struct us_data *us,
len = min(sectors, (unsigned int) info->blocksize) * info->pagesize; len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;
buffer = kmalloc(len, GFP_NOIO); buffer = kmalloc(len, GFP_NOIO);
if (buffer == NULL) { if (!buffer) {
printk(KERN_WARNING "sddr09_write_data: Out of memory\n");
kfree(blockbuffer); kfree(blockbuffer);
return -ENOMEM; return -ENOMEM;
} }
@@ -1241,8 +1236,7 @@ sddr09_read_map(struct us_data *us) {
alloc_blocks = min(numblocks, SDDR09_READ_MAP_BUFSZ >> CONTROL_SHIFT); alloc_blocks = min(numblocks, SDDR09_READ_MAP_BUFSZ >> CONTROL_SHIFT);
alloc_len = (alloc_blocks << CONTROL_SHIFT); alloc_len = (alloc_blocks << CONTROL_SHIFT);
buffer = kmalloc(alloc_len, GFP_NOIO); buffer = kmalloc(alloc_len, GFP_NOIO);
if (buffer == NULL) { if (!buffer) {
printk(KERN_WARNING "sddr09_read_map: out of memory\n");
result = -1; result = -1;
goto done; goto done;
} }