Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[linux-2.6.git] / drivers / pcmcia / soc_common.c

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 89edcbc3bfd2f6214a6d378ebb3b2e1675cbf232..f49ac6666153bca4718a4813878bb5fba5f7b429 100644 (file)
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -43,7 +43,7 @@
 #include <linux/spinlock.h>
 #include <linux/cpufreq.h>
 
 #include <linux/spinlock.h>
 #include <linux/cpufreq.h>
 

-#include <asm/hardware.h>
+#include <mach/hardware.h>

 #include <asm/io.h>
 #include <asm/system.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
 


@@ -51,7 +51,7 @@
 
 /* FIXME: platform dependent resource declaration has to move out of this file */
 #ifdef CONFIG_ARCH_PXA
 
 /* FIXME: platform dependent resource declaration has to move out of this file */
 #ifdef CONFIG_ARCH_PXA

-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>

 #endif
 
 #ifdef CONFIG_PCMCIA_DEBUG
 #endif
 
 #ifdef CONFIG_PCMCIA_DEBUG


@@ -748,7 +748,9 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
 
                add_timer(&skt->poll_timer);
 
 
                add_timer(&skt->poll_timer);
 

-               device_create_file(&skt->socket.dev, &dev_attr_status);
+               ret = device_create_file(&skt->socket.dev, &dev_attr_status);
+               if (ret)
+                       goto out_err_8;

        }
 
        dev_set_drvdata(dev, sinfo);
        }
 
        dev_set_drvdata(dev, sinfo);


@@ -758,6 +760,8 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
        do {
                skt = &sinfo->skt[i];
 
        do {
                skt = &sinfo->skt[i];
 

+               device_remove_file(&skt->socket.dev, &dev_attr_status);
+ out_err_8:

                del_timer_sync(&skt->poll_timer);
                pcmcia_unregister_socket(&skt->socket);
 
                del_timer_sync(&skt->poll_timer);
                pcmcia_unregister_socket(&skt->socket);