diff options
author | Andrew Morton <akpm@osdl.org> | 2006-10-01 03:23:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 04:33:43 +0200 |
commit | cb5d9e0948122dd8b808550574d95bd60674ba3b (patch) | |
tree | f10c819fb1ec99df7c1b71aadff9bcae7591660e /include/scsi/scsi_device.h | |
parent | Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
download | linux-cb5d9e0948122dd8b808550574d95bd60674ba3b.tar.xz linux-cb5d9e0948122dd8b808550574d95bd60674ba3b.zip |
[PATCH] scsi: device_reprobe() can fail
device_reprobe() should return an error code. When it does so,
scsi_device_reprobe() should propagate it back.
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/scsi/scsi_device.h')
-rw-r--r-- | include/scsi/scsi_device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 895d212864cd..b401c82036be 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -298,9 +298,9 @@ extern int scsi_execute_async(struct scsi_device *sdev, void (*done)(void *, char *, int, int), gfp_t gfp); -static inline void scsi_device_reprobe(struct scsi_device *sdev) +static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev) { - device_reprobe(&sdev->sdev_gendev); + return device_reprobe(&sdev->sdev_gendev); } static inline unsigned int sdev_channel(struct scsi_device *sdev) |