mtd/r852: register IRQ as last step
authorMaxim Levitsky <maximlevitsky@gmail.com>
Wed, 2 Jun 2010 13:01:45 +0000 (16:01 +0300)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 2 Jun 2010 13:53:16 +0000 (14:53 +0100)
Otherwise, if it fires right away, it might access
uninitialized spinlock

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/r852.c

index 78a4232954748641e7fcd655056d83404b3d87a1..20a654a94d3065fdfc602fae23da95dce4391141 100644 (file)
@@ -940,18 +940,19 @@ int  r852_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
 
        r852_dma_test(dev);
 
+       dev->irq = pci_dev->irq;
+       spin_lock_init(&dev->irqlock);
+
+       dev->card_detected = 0;
+       r852_card_update_present(dev);
+
        /*register irq handler*/
        error = -ENODEV;
        if (request_irq(pci_dev->irq, &r852_irq, IRQF_SHARED,
                          DRV_NAME, dev))
                goto error10;
 
-       dev->irq = pci_dev->irq;
-       spin_lock_init(&dev->irqlock);
-
        /* kick initial present test */
-       dev->card_detected = 0;
-       r852_card_update_present(dev);
        queue_delayed_work(dev->card_workqueue,
                &dev->card_detect_work, 0);