projects/linux·commit 83bf6f11

pcmcia: fix matching rules for pseudo-multi-function cards

83bf6f11 · Alexander Kurz <[email protected]> · 2010-04-25 13:44:35 +04:00

Prevent PCMCIA_DEV_ID_MATCH_FUNC_ID from grabbing PFC-cards:
I changed the code, so that the first matching struct
pcmcia_device_id _PFC_ entry will mark the card has_pfc,
preventing PCMCIA_DEV_ID_MATCH_FUNC_ID to match.

[[email protected]: re-order commit message]
Signed-off-by: Alexander Kurz <[email protected]>
Signed-off-by: Dominik Brodowski <[email protected]>
Commit
83bf6f11e82eba8533f8dbd241b2c2825e42ae5d
Parents
04de0816

Changes

1 files changed · +4 −3

FileStatusAddDelContent
drivers/pcmcia/ds.cmodified+4−3View file

drivers/pcmcia/ds.c

View file
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 92a5af8..508f94a 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -820,11 +820,12 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
}
if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) {
- if (dev->device_no != did->device_no)
- return 0;
+ dev_dbg(&dev->dev, "this is a pseudo-multi-function device\n");
mutex_lock(&dev->socket->ops_mutex);
dev->socket->pcmcia_state.has_pfc = 1;
mutex_unlock(&dev->socket->ops_mutex);
+ if (dev->device_no != did->device_no)
+ return 0;
}
if (did->match_flags & PCMCIA_DEV_ID_MATCH_FUNC_ID) {
@@ -835,7 +836,7 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
/* if this is a pseudo-multi-function device,
* we need explicit matches */
- if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO)
+ if (dev->socket->pcmcia_state.has_pfc)
return 0;
if (dev->device_no)
return 0;