diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 14:59:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 14:59:27 -0500 |
| commit | 3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6 (patch) | |
| tree | 949e577cdb14a51de5075505502ed30d277f5c50 /drivers/scsi/scsi_lib.c | |
| parent | b8c9a18712f7b617fda66d878ce3759c9e575ba0 (diff) | |
| parent | 751bf4d7865e4ced406be93b04c7436d866d3684 (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] scsi_sysfs: restore prep_fn when ULD is removed
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 8df8267ce316..60f77c4b3946 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -1346,7 +1346,7 @@ int scsi_prep_return(struct request_queue *q, struct request *req, int ret) | |||
| 1346 | } | 1346 | } |
| 1347 | EXPORT_SYMBOL(scsi_prep_return); | 1347 | EXPORT_SYMBOL(scsi_prep_return); |
| 1348 | 1348 | ||
| 1349 | static int scsi_prep_fn(struct request_queue *q, struct request *req) | 1349 | int scsi_prep_fn(struct request_queue *q, struct request *req) |
| 1350 | { | 1350 | { |
| 1351 | struct scsi_device *sdev = q->queuedata; | 1351 | struct scsi_device *sdev = q->queuedata; |
| 1352 | int ret = BLKPREP_KILL; | 1352 | int ret = BLKPREP_KILL; |