diff options
author | Andrew Morton <akpm@osdl.org> | 2006-09-30 21:23:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 22:33:43 -0400 |
commit | cb5d9e0948122dd8b808550574d95bd60674ba3b (patch) | |
tree | f10c819fb1ec99df7c1b71aadff9bcae7591660e | |
parent | cfae35804bcb909225d6f4eb5bd29e25971614d8 (diff) |
[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>
-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 895d212864c..b401c82036b 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, | |||
298 | void (*done)(void *, char *, int, int), | 298 | void (*done)(void *, char *, int, int), |
299 | gfp_t gfp); | 299 | gfp_t gfp); |
300 | 300 | ||
301 | static inline void scsi_device_reprobe(struct scsi_device *sdev) | 301 | static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev) |
302 | { | 302 | { |
303 | device_reprobe(&sdev->sdev_gendev); | 303 | return device_reprobe(&sdev->sdev_gendev); |
304 | } | 304 | } |
305 | 305 | ||
306 | static inline unsigned int sdev_channel(struct scsi_device *sdev) | 306 | static inline unsigned int sdev_channel(struct scsi_device *sdev) |