Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[safe/jmp/linux-2.6] / drivers / pcmcia / at91_cf.c

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 7f5df9a..3bcb7dc 100644 (file)
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -241,12 +241,6 @@ static int __init at91_cf_probe(struct platform_device *pdev)
        csa = at91_sys_read(AT91_EBI_CSA);
        at91_sys_write(AT91_EBI_CSA, csa | AT91_EBI_CS4A_SMC_COMPACTFLASH);
 
-       /* force poweron defaults for these pins ... */
-       (void) at91_set_A_periph(AT91_PIN_PC9, 0);      /* A25/CFRNW */
-       (void) at91_set_A_periph(AT91_PIN_PC10, 0);     /* NCS4/CFCS */
-       (void) at91_set_A_periph(AT91_PIN_PC11, 0);     /* NCS5/CFCE1 */
-       (void) at91_set_A_periph(AT91_PIN_PC12, 0);     /* NCS6/CFCE2 */
-
        /* nWAIT is _not_ a default setting */
        (void) at91_set_A_periph(AT91_PIN_PC6, 1);      /*  nWAIT */
 
@@ -316,12 +310,14 @@ static int __init at91_cf_probe(struct platform_device *pdev)
        return 0;
 
 fail2:
-       iounmap((void __iomem *) cf->socket.io_offset);
        release_mem_region(io->start, io->end + 1 - io->start);
 fail1:
+       if (cf->socket.io_offset)
+               iounmap((void __iomem *) cf->socket.io_offset);
        if (board->irq_pin)
                free_irq(board->irq_pin, cf);
 fail0a:
+       device_init_wakeup(&pdev->dev, 0);
        free_irq(board->det_pin, cf);
        device_init_wakeup(&pdev->dev, 0);
 fail0:
@@ -360,26 +356,20 @@ static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
        struct at91_cf_data     *board = cf->board;
 
        pcmcia_socket_dev_suspend(&pdev->dev, mesg);
-       if (device_may_wakeup(&pdev->dev))
+       if (device_may_wakeup(&pdev->dev)) {
                enable_irq_wake(board->det_pin);
-       else {
+               if (board->irq_pin)
+                       enable_irq_wake(board->irq_pin);
+       } else {
                disable_irq_wake(board->det_pin);
-               disable_irq(board->det_pin);
+               if (board->irq_pin)
+                       disable_irq_wake(board->irq_pin);
        }
-       if (board->irq_pin)
-               disable_irq(board->irq_pin);
        return 0;
 }
 
 static int at91_cf_resume(struct platform_device *pdev)
 {
-       struct at91_cf_socket   *cf = platform_get_drvdata(pdev);
-       struct at91_cf_data     *board = cf->board;
-
-       if (board->irq_pin)
-               enable_irq(board->irq_pin);
-       if (!device_may_wakeup(&pdev->dev))
-               enable_irq(board->det_pin);
        pcmcia_socket_dev_resume(&pdev->dev);
        return 0;
 }