summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-06-27 16:28:09 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 18:03:07 -0700
commitf602ff7eb4e44e7245bfeeba4d078144703fcd76 (patch)
treee919cf5470a7e963ae4ce9f21b7fa1ed3bd4cb71
parentff1fa9ef3c9fb23a6baa06b63f4bdf3de089b29a (diff)
downloadop-kernel-dev-f602ff7eb4e44e7245bfeeba4d078144703fcd76.zip
op-kernel-dev-f602ff7eb4e44e7245bfeeba4d078144703fcd76.tar.gz
[PATCH] pcmcia: match "anonymous" cards
If a card doesn't provide _any_ information about itself, assume it is a so-called "anonymous" card. pcmciamtd will bind to it if it is configured to do so. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/pcmcia/ds.c9
-rw-r--r--include/linux/mod_devicetable.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index f657a2a..6668069 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -746,6 +746,15 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
}
}
+ if (did->match_flags & PCMCIA_DEV_ID_MATCH_ANONYMOUS) {
+ int i;
+ for (i=0; i<4; i++)
+ if (dev->prod_id[i])
+ return 0;
+ if (dev->has_manf_id || dev->has_card_id || dev->has_func_id)
+ 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 c0106d6..8a8dc82 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -209,5 +209,6 @@ struct pcmcia_device_id {
#define PCMCIA_DEV_ID_MATCH_PROD_ID4 0x0080
#define PCMCIA_DEV_ID_MATCH_DEVICE_NO 0x0100
#define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200
+#define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400
#endif /* LINUX_MOD_DEVICETABLE_H */
OpenPOWER on IntegriCloud