Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.6.26-rc1-git7 /drivers/ide/ide-probe.c

Filename:/drivers/ide/ide-probe.c
Lines Added:6
Lines Deleted:6
Also changed in: (Previous) 2.6.26-rc1-git6  2.6.26-rc1-git5  2.6.26-rc1-git4  2.6.26-rc1-git3  2.6.26-rc1-git2  2.6.26-rc1 
(Following) 2.6.26-rc1-git8  2.6.26-rc1-git9  2.6.26-rc2  2.6.26-rc3  2.6.26-rc3-git3  2.6.26-rc3-git4 

Location
[  2.6.26-rc1-git7
  [  drivers
    [  ide
       o  ide-probe.c

Patch

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 591deda..34b0d4f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1355,12 +1355,6 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
    if (hwif->chipset != ide_dtc2278 || hwif->channel == 0)
       hwif->port_ops = d->port_ops;
 
-   if ((d->host_flags & IDE_HFLAG_SERIALIZE) ||
-       ((d->host_flags & IDE_HFLAG_SERIALIZE_DMA) && hwif->dma_base)) {
-      if (hwif->mate)
-         hwif->mate->serialized = hwif->serialized = 1;
-   }
-
    hwif->swdma_mask = d->swdma_mask;
    hwif->mwdma_mask = d->mwdma_mask;
    hwif->ultra_mask = d->udma_mask;
@@ -1382,6 +1376,12 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
          hwif->dma_ops = d->dma_ops;
    }
 
+   if ((d->host_flags & IDE_HFLAG_SERIALIZE) ||
+       ((d->host_flags & IDE_HFLAG_SERIALIZE_DMA) && hwif->dma_base)) {
+      if (hwif->mate)
+         hwif->mate->serialized = hwif->serialized = 1;
+   }
+
    if (d->host_flags & IDE_HFLAG_RQSIZE_256)
       hwif->rqsize = 256;
 


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.