diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 00:53:00 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 00:53:00 (GMT) |
| commit | bb3613aa34a81a5e2f1227ccdb801fde04a7da10 (patch) | |
| tree | bb79c15d5da41113bd7b83d9e74fbfc4a1bf8569 /drivers/scsi | |
| parent | 6971071cdda79cad5f53ba390e466d696e7e9006 (diff) | |
| parent | bb1c9034b3ce7f29d3d178a87b42b767611d6574 (diff) | |
| download | linux-fsl-qoriq-bb3613aa34a81a5e2f1227ccdb801fde04a7da10.tar.xz | |
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 5b6bbae..4a38422 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1637,9 +1637,8 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost, blk_queue_max_segment_size(q, dma_get_max_seg_size(dev)); - /* New queue, no concurrency on queue_flags */ if (!shost->use_clustering) - queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q); + q->limits.cluster = 0; /* * set a reasonable default alignment on word boundaries: the |