diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-11 13:11:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-11 13:11:00 +1100 |
| commit | bc13cc74c91ae8f94389dbc1af0db2a79d0fc87e (patch) | |
| tree | 9ad7386552b44e942a367870e12c9f8ae1756f6f /include | |
| parent | e28d61eb1d0cdec1c2a4f641e3e976f7bfbbf8e3 (diff) | |
| parent | 8605c46c171f02859fb3a32655fa226ce446c6ec (diff) | |
Merge commit 'refs/next/20100209/scsi'
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 7c4449900c24..d80b6dbed1ca 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -348,7 +348,8 @@ extern int scsi_mode_select(struct scsi_device *sdev, int pf, int sp, struct scsi_sense_hdr *); extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries, struct scsi_sense_hdr *sshdr); -extern unsigned char *scsi_get_vpd_page(struct scsi_device *, u8 page); +extern int scsi_get_vpd_page(struct scsi_device *, u8 page, unsigned char *buf, + int buf_len); extern int scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state); extern struct scsi_event *sdev_evt_alloc(enum scsi_device_event evt_type, |