Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / ata / pata_at32.c

diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index 528315587532fa6ee5ede20be56f8a55b0deadba..82fb6e2731690f11194fd286810c807b14795c3b 100644 (file)
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -223,7 +223,7 @@ static int __init pata_at32_init_one(struct device *dev,
        host->private_data = info;
 
        /* Register ATA device and return */
-       return ata_host_activate(host, info->irq, ata_interrupt,
+       return ata_host_activate(host, info->irq, ata_sff_interrupt,
                                 IRQF_SHARED | IRQF_TRIGGER_RISING,
                                 &at32_sht);
 }
@@ -291,8 +291,6 @@ static int __init pata_at32_probe(struct platform_device *pdev)
        if (!info)
                return -ENOMEM;
 
-       memset(info, 0, sizeof(struct at32_ide_info));
-
        info->irq = irq;
        info->cs  = board->cs;
 
@@ -381,6 +379,9 @@ static int __exit pata_at32_remove(struct platform_device *pdev)
        return 0;
 }
 
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:at32_ide");
+
 static struct platform_driver pata_at32_driver = {
        .remove        = __exit_p(pata_at32_remove),
        .driver        = {