[PATCH] pcmcia: match for fake CIS

Add another match flag for devices needing a CIS override.  The driver will
only probe/attach if the CIS has been replaced before.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 3ac7a44..c0611d5 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -733,6 +733,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
                        return 0;
        }
 
+       if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
+               if (!dev->socket->fake_cis) {
+                       /* FIXME: evaluate using firmware helpers to
+                        * automagically load it from userspace */
+                       return 0;
+               }
+       }
+
        dev->dev.driver_data = (void *) did;
 
        return 1;

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index e9651cd..c0106d6 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -196,6 +196,7 @@ struct pcmcia_device_id {
 
        /* not matched against */
        kernel_ulong_t  driver_info;
+       char *          cisfile;
 };
 
 #define PCMCIA_DEV_ID_MATCH_MANF_ID    0x0001
@@ -207,5 +208,6 @@ struct pcmcia_device_id {
 #define PCMCIA_DEV_ID_MATCH_PROD_ID3   0x0040
 #define PCMCIA_DEV_ID_MATCH_PROD_ID4   0x0080
 #define PCMCIA_DEV_ID_MATCH_DEVICE_NO  0x0100
+#define PCMCIA_DEV_ID_MATCH_FAKE_CIS   0x0200
 
 #endif /* LINUX_MOD_DEVICETABLE_H */

diff --cc include/pcmcia/device_id.h
Simple merge