ide: move ->rqsize init from init_irq() to ide_init_port()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 974067043fba..b0510b033d78 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -861,14 +861,6 @@ static int init_irq (ide_hwif_t *hwif)
         if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif))
                 goto out_up;
 
-        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 !defined(__mc68000__)
         printk(KERN_INFO "%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
                 io_ports->data_addr, io_ports->status_addr,
@@ -1114,6 +1106,13 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
 
         if (d->max_sectors)
                 hwif->rqsize = d->max_sectors;
+        else {
+                if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
+                    (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))
+                        hwif->rqsize = 256;
+                else
+                        hwif->rqsize = 65536;
+        }
 
         /* call chipset specific routine for each enabled port */
         if (d->init_hwif)