forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into for-next

Browse source 
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
This commit is contained in:
Jiri Kosina 2011-09-15 15:08:05 +02:00
commit e060c38434
3980 changed files with 199230 additions and 61613 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/scsi/pmcraid.c
View file

@ -3870,6 +3870,9 @@ static long pmcraid_ioctl_passthrough(
pmcraid_err("couldn't build passthrough ioadls\n");
goto out_free_buffer;
}
} else if (request_size < 0) {
rc = -EINVAL;
goto out_free_buffer;
}
/* If data is being written into the device, copy the data from user