diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-06 10:01:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-06 10:01:54 -0700 |
| commit | e5e06985bec89414ce2b3f301c24d884f609b020 (patch) | |
| tree | da702c3e4facd0b41faaba34ea98aa3556ce525a /drivers | |
| parent | fa039d5f6b126fbd65eefa05db2f67e44df8f121 (diff) | |
| parent | c055f5b2614b4f758ae6cc86733f31fa4c2c5844 (diff) | |
| download | linux-3.10-e5e06985bec89414ce2b3f301c24d884f609b020.tar.gz linux-3.10-e5e06985bec89414ce2b3f301c24d884f609b020.tar.bz2 linux-3.10-e5e06985bec89414ce2b3f301c24d884f609b020.zip | |
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] fix oops in scsi_run_queue()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index e9901b8f844..0bac91e7237 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -400,10 +400,15 @@ static inline int scsi_host_is_busy(struct Scsi_Host *shost) static void scsi_run_queue(struct request_queue *q) { struct scsi_device *sdev = q->queuedata; - struct Scsi_Host *shost = sdev->host; + struct Scsi_Host *shost; LIST_HEAD(starved_list); unsigned long flags; + /* if the device is dead, sdev will be NULL, so no queue to run */ + if (!sdev) + return; + + shost = sdev->host; if (scsi_target(sdev)->single_lun) scsi_single_lun_run(sdev); |