diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /drivers/scsi/pmcraid.c | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'drivers/scsi/pmcraid.c')
| -rw-r--r-- | drivers/scsi/pmcraid.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index ee161c6ca712..b86db84d6f32 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
| @@ -3870,6 +3870,9 @@ static long pmcraid_ioctl_passthrough( | |||
| 3870 | pmcraid_err("couldn't build passthrough ioadls\n"); | 3870 | pmcraid_err("couldn't build passthrough ioadls\n"); |
| 3871 | goto out_free_buffer; | 3871 | goto out_free_buffer; |
| 3872 | } | 3872 | } |
| 3873 | } else if (request_size < 0) { | ||
| 3874 | rc = -EINVAL; | ||
| 3875 | goto out_free_buffer; | ||
| 3873 | } | 3876 | } |
| 3874 | 3877 | ||
| 3875 | /* If data is being written into the device, copy the data from user | 3878 | /* If data is being written into the device, copy the data from user |