diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:13:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:13:09 -0400 |
| commit | 30c278192f9ab06125fb042f6e46763e0fd7140a (patch) | |
| tree | eb457072fec9bed01d89a71ab61257785a24a66a /drivers | |
| parent | ef2533dae5a93527f2aac9449c0b1564c5ed2c2f (diff) | |
| parent | 478971600e47cb83ff2d3c63c5c24f2b04b0d6a1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bsg: fix incorrect device_status value
[SCSI] Fix VPD inquiry page wrapper
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index ad0ed212db4a..348fba0a8976 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
| @@ -1046,13 +1046,13 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, | |||
| 1046 | 1046 | ||
| 1047 | /* If the user actually wanted this page, we can skip the rest */ | 1047 | /* If the user actually wanted this page, we can skip the rest */ |
| 1048 | if (page == 0) | 1048 | if (page == 0) |
| 1049 | return -EINVAL; | 1049 | return 0; |
| 1050 | 1050 | ||
| 1051 | for (i = 0; i < min((int)buf[3], buf_len - 4); i++) | 1051 | for (i = 0; i < min((int)buf[3], buf_len - 4); i++) |
| 1052 | if (buf[i + 4] == page) | 1052 | if (buf[i + 4] == page) |
| 1053 | goto found; | 1053 | goto found; |
| 1054 | 1054 | ||
| 1055 | if (i < buf[3] && i > buf_len) | 1055 | if (i < buf[3] && i >= buf_len - 4) |
| 1056 | /* ran off the end of the buffer, give us benefit of doubt */ | 1056 | /* ran off the end of the buffer, give us benefit of doubt */ |
| 1057 | goto found; | 1057 | goto found; |
| 1058 | /* The device claims it doesn't support the requested page */ | 1058 | /* The device claims it doesn't support the requested page */ |