3 files changed, 31 insertions, 8 deletions

diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index a638e952d67a..d4d7ff1a3516 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -40,8 +40,27 @@
      *  which is shared between several drivers.
      */
 
-int falconide_intr_lock;
-EXPORT_SYMBOL(falconide_intr_lock);
+static int falconide_intr_lock;
+
+static void falconide_release_lock(void)
+{
+        if (falconide_intr_lock == 0) {
+                printk(KERN_ERR "%s: bug\n", __func__);
+                return;
+        }
+        falconide_intr_lock = 0;
+        stdma_release();
+}
+
+static void falconide_get_lock(irq_handler_t handler, void *data)
+{
+        if (falconide_intr_lock == 0) {
+                if (in_interrupt() > 0)
+                        panic("Falcon IDE hasn't ST-DMA lock in interrupt");
+                stdma_lock(handler, data);
+                falconide_intr_lock = 1;
+        }
+}
 
 static void falconide_input_data(ide_drive_t *drive, struct request *rq,
                                  void *buf, unsigned int len)
@@ -81,6 +100,8 @@ static const struct ide_tp_ops falconide_tp_ops = {
 };
 
 static const struct ide_port_info falconide_port_info = {
+        .get_lock               = falconide_get_lock,
+        .release_lock           = falconide_release_lock,
         .tp_ops                 = &falconide_tp_ops,
         .host_flags             = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE,
 };
@@ -132,9 +153,9 @@ static int __init falconide_init(void)
                 goto err;
         }
 
-        ide_get_lock(NULL, NULL);
+        falconide_get_lock(NULL, NULL);
         rc = ide_host_register(host, &falconide_port_info, hws);
-        ide_release_lock();
+        falconide_release_lock();
 
         if (rc)
                 goto err_free;
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index e85060164203..030b0ea1a1e1 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -501,8 +501,8 @@ static inline int ide_lock_host(struct ide_host *host, ide_hwif_t *hwif)
         if (host->host_flags & IDE_HFLAG_SERIALIZE) {
                 rc = test_and_set_bit_lock(IDE_HOST_BUSY, &host->host_busy);
                 if (rc == 0) {
-                        /* for atari only */
-                        ide_get_lock(ide_intr, hwif);
+                        if (host->get_lock)
+                                host->get_lock(ide_intr, hwif);
                 }
         }
         return rc;
@@ -511,8 +511,8 @@ static inline int ide_lock_host(struct ide_host *host, ide_hwif_t *hwif)
 static inline void ide_unlock_host(struct ide_host *host)
 {
         if (host->host_flags & IDE_HFLAG_SERIALIZE) {
-                /* for atari only */
-                ide_release_lock();
+                if (host->release_lock)
+                        host->release_lock();
                 clear_bit_unlock(IDE_HOST_BUSY, &host->host_busy);
         }
 }
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index b0510b033d78..a3edbb5d0452 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1325,6 +1325,8 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
 
         if (d) {
                 host->init_chipset = d->init_chipset;
+                host->get_lock     = d->get_lock;
+                host->release_lock = d->release_lock;
                 host->host_flags = d->host_flags;
         }