1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index f16521254867..24a845d45bd2 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -67,20 +67,24 @@ static void sub22 (char b, char c)
         }
 }
 
+static DEFINE_SPINLOCK(dtc2278_lock);
+
 static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         unsigned long flags;
 
         if (pio >= 3) {
-                spin_lock_irqsave(&ide_lock, flags);
+                spin_lock_irqsave(&dtc2278_lock, flags);
                 /*
                  * This enables PIO mode4 (3?) on the first interface
                  */
                 sub22(1,0xc3);
                 sub22(0,0xa0);
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&dtc2278_lock, flags);
         } else {
                 /* we don't know how to set it back again.. */
+                /* Actually we do - there is a data sheet available for the
+                   Winbond but does anyone actually care */
         }
 
         /*
@@ -94,6 +98,7 @@ static int __init dtc2278_probe(void)
 {
         unsigned long flags;
         ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
 
         hwif = &ide_hwifs[0];
         mate = &ide_hwifs[1];
@@ -129,16 +134,13 @@ static int __init dtc2278_probe(void)
 
         mate->serialized = 1;
         mate->chipset = ide_dtc2278;
+        mate->pio_mask = ATA_PIO4;
         mate->drives[0].no_unmask = 1;
         mate->drives[1].no_unmask = 1;
         mate->mate = hwif;
         mate->channel = 1;
 
-        probe_hwif_init(hwif);
-        probe_hwif_init(mate);
-
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
+        ide_device_add(idx);
 
         return 0;
 }