1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index ae4454d4e955..cbaf2eddac6b 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -1,7 +1,7 @@
 /*
  * pata_atiixp.c        - ATI PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        (C) 2009 Bartlomiej Zolnierkiewicz
+ *                        (C) 2009-2010 Bartlomiej Zolnierkiewicz
  *
  * Based on
  *
@@ -46,6 +46,8 @@ static int atiixp_cable_detect(struct ata_port *ap)
         return ATA_CBL_PATA40;
 }
 
+static DEFINE_SPINLOCK(atiixp_lock);
+
 /**
  *      atiixp_set_pio_timing   -       set initial PIO mode data
  *      @ap: ATA interface
@@ -88,7 +90,10 @@ static void atiixp_set_pio_timing(struct ata_port *ap, struct ata_device *adev,
 
 static void atiixp_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
+        unsigned long flags;
+        spin_lock_irqsave(&atiixp_lock, flags);
         atiixp_set_pio_timing(ap, adev, adev->pio_mode - XFER_PIO_0);
+        spin_unlock_irqrestore(&atiixp_lock, flags);
 }
 
 /**
@@ -108,6 +113,9 @@ static void atiixp_set_dmamode(struct ata_port *ap, struct ata_device *adev)
         int dma = adev->dma_mode;
         int dn = 2 * ap->port_no + adev->devno;
         int wanted_pio;
+        unsigned long flags;
+
+        spin_lock_irqsave(&atiixp_lock, flags);
 
         if (adev->dma_mode >= XFER_UDMA_0) {
                 u16 udma_mode_data;
@@ -145,6 +153,7 @@ static void atiixp_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 
         if (adev->pio_mode != wanted_pio)
                 atiixp_set_pio_timing(ap, adev, wanted_pio);
+        spin_unlock_irqrestore(&atiixp_lock, flags);
 }
 
 /**
@@ -237,7 +246,8 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 if (!pci_test_config_bits(pdev, &atiixp_enable_bits[i]))
                         ppi[i] = &ata_dummy_port_info;
 
-        return ata_pci_sff_init_one(pdev, ppi, &atiixp_sht, NULL);
+        return ata_pci_sff_init_one(pdev, ppi, &atiixp_sht, NULL,
+                                                ATA_HOST_PARALLEL_SCAN);
 }
 
 static const struct pci_device_id atiixp[] = {