diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 08:43:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 08:43:05 -0700 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/scsi | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/scsi')
| -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 ad0ed212db4..348fba0a897 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, /* If the user actually wanted this page, we can skip the rest */ if (page == 0) - return -EINVAL; + return 0; for (i = 0; i < min((int)buf[3], buf_len - 4); i++) if (buf[i + 4] == page) goto found; - if (i < buf[3] && i > buf_len) + if (i < buf[3] && i >= buf_len - 4) /* ran off the end of the buffer, give us benefit of doubt */ goto found; /* The device claims it doesn't support the requested page */ |