diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-12 05:57:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-12 05:57:09 -0400 |
| commit | ddc4097b77bbb227851a44287acb2fb8a9896cc1 (patch) | |
| tree | 319d098879bed7c45543d983de8becd509701b22 /drivers/scsi/scsi_lib.c | |
| parent | bec4c99e8637b5b8bd4b0513eacb51da25885e3b (diff) | |
| parent | ae31c1fbdbb18d917b0a1139497c2dbd35886989 (diff) | |
Merge branch 'topic/drvdata-fix' into topic/asoc
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index d1cb64ad1a3f..bb218c8b6e98 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -1291,10 +1291,8 @@ static inline int scsi_target_queue_ready(struct Scsi_Host *shost, | |||
| 1291 | if (--starget->target_blocked == 0) { | 1291 | if (--starget->target_blocked == 0) { |
| 1292 | SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget, | 1292 | SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget, |
| 1293 | "unblocking target at zero depth\n")); | 1293 | "unblocking target at zero depth\n")); |
| 1294 | } else { | 1294 | } else |
| 1295 | blk_plug_device(sdev->request_queue); | ||
| 1296 | return 0; | 1295 | return 0; |
| 1297 | } | ||
| 1298 | } | 1296 | } |
| 1299 | 1297 | ||
| 1300 | if (scsi_target_is_busy(starget)) { | 1298 | if (scsi_target_is_busy(starget)) { |