[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>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 3ac7a443f668..c0611d56eab2 100644
--- 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;