diff options
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
| -rw-r--r-- | drivers/scsi/ide-scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 02e91893064d..db8bc20539e1 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
| @@ -919,8 +919,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd) | |||
| 919 | } | 919 | } |
| 920 | 920 | ||
| 921 | /* kill current request */ | 921 | /* kill current request */ |
| 922 | blkdev_dequeue_request(req); | 922 | if (__blk_end_request(req, -EIO, 0)) |
| 923 | end_that_request_last(req, 0); | 923 | BUG(); |
| 924 | if (blk_sense_request(req)) | 924 | if (blk_sense_request(req)) |
| 925 | kfree(scsi->pc->buffer); | 925 | kfree(scsi->pc->buffer); |
| 926 | kfree(scsi->pc); | 926 | kfree(scsi->pc); |
| @@ -929,8 +929,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd) | |||
| 929 | 929 | ||
| 930 | /* now nuke the drive queue */ | 930 | /* now nuke the drive queue */ |
| 931 | while ((req = elv_next_request(drive->queue))) { | 931 | while ((req = elv_next_request(drive->queue))) { |
| 932 | blkdev_dequeue_request(req); | 932 | if (__blk_end_request(req, -EIO, 0)) |
| 933 | end_that_request_last(req, 0); | 933 | BUG(); |
| 934 | } | 934 | } |
| 935 | 935 | ||
| 936 | HWGROUP(drive)->rq = NULL; | 936 | HWGROUP(drive)->rq = NULL; |