|
@@ -606,7 +606,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
|
|
|
ret = __bsg_read(buf, count, bd, NULL, &bytes_read);
|
|
|
*ppos = bytes_read;
|
|
|
|
|
|
- if (!bytes_read || (bytes_read && err_block_err(ret)))
|
|
|
+ if (!bytes_read || err_block_err(ret))
|
|
|
bytes_read = ret;
|
|
|
|
|
|
return bytes_read;
|
|
@@ -686,7 +686,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
|
|
|
/*
|
|
|
* return bytes written on non-fatal errors
|
|
|
*/
|
|
|
- if (!bytes_written || (bytes_written && err_block_err(ret)))
|
|
|
+ if (!bytes_written || err_block_err(ret))
|
|
|
bytes_written = ret;
|
|
|
|
|
|
dprintk("%s: returning %Zd\n", bd->name, bytes_written);
|