|
@@ -881,13 +881,6 @@ static int ide_init_queue(ide_drive_t *drive)
|
|
|
q->queuedata = drive;
|
|
|
blk_queue_segment_boundary(q, 0xffff);
|
|
|
|
|
|
- if (!hwif->rqsize) {
|
|
|
- if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
|
|
|
- (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))
|
|
|
- hwif->rqsize = 256;
|
|
|
- else
|
|
|
- hwif->rqsize = 65536;
|
|
|
- }
|
|
|
if (hwif->rqsize < max_sectors)
|
|
|
max_sectors = hwif->rqsize;
|
|
|
blk_queue_max_sectors(q, max_sectors);
|
|
@@ -1019,6 +1012,14 @@ static int init_irq (ide_hwif_t *hwif)
|
|
|
goto out_unlink;
|
|
|
}
|
|
|
|
|
|
+ if (!hwif->rqsize) {
|
|
|
+ if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
|
|
|
+ (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))
|
|
|
+ hwif->rqsize = 256;
|
|
|
+ else
|
|
|
+ hwif->rqsize = 65536;
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
* For any present drive:
|
|
|
* - allocate the block device queue
|