Commit fd233925 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

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

All kmalloc-based functions print enough information on failures.
Signed-off-by: default avatarWolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5cdac92
...@@ -766,10 +766,8 @@ sddr09_read_data(struct us_data *us, ...@@ -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, ...@@ -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, ...@@ -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) { ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment