diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-02 15:37:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-02 15:37:08 -0400 |
| commit | 3687a2c0d81b23d30db4384ca804a701fc686e16 (patch) | |
| tree | 8f0582f6939ef9f0f7079bbbcc4025e46ea19f79 /drivers/scsi/pmcraid.c | |
| parent | b4d246b12410b53506c311e5e0b6abb71ead65c6 (diff) | |
| parent | c7bcecbe98fe29e87ac7d01c70c5998806e0989f (diff) | |
Merge branch 'linus' into timers/core
Reason: Pick up the hrtimer_clock_to_base_table fix from mainline
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 96d5ad0c1e42..7f636b118287 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
| @@ -3814,6 +3814,9 @@ static long pmcraid_ioctl_passthrough( | |||
| 3814 | rc = -EFAULT; | 3814 | rc = -EFAULT; |
| 3815 | goto out_free_buffer; | 3815 | goto out_free_buffer; |
| 3816 | } | 3816 | } |
| 3817 | } else if (request_size < 0) { | ||
| 3818 | rc = -EINVAL; | ||
| 3819 | goto out_free_buffer; | ||
| 3817 | } | 3820 | } |
| 3818 | 3821 | ||
| 3819 | /* check if we have any additional command parameters */ | 3822 | /* check if we have any additional command parameters */ |