summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2009-11-07 12:26:17 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2009-11-09 08:30:17 +0100
commit638bba55fe6440439005f02fcd6b0c1f908d0d11 (patch)
tree84952104cf985248738106eabfc71b205f0b85ba /drivers/pcmcia/cs.c
parent55a19b39acb8888af8e9cfe5b762d03c52fdb48c (diff)
pcmcia: autoload module pcmcia
Attempt to load the "pcmcia" module for 16-bit PCMCIA cards, so that PCMCIA support becomes available without pcmciautils/udev userspace interaction. Based on a suggestion and a patch Signed-off-by: Komuro <komurojun-mbn@nifty.com> but converted it to request_module_nowait() and move it to a later stage. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r--drivers/pcmcia/cs.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index b229f6d9e44..fc1c0c6baae 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -243,6 +243,13 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
pcmcia_parse_events(socket, SS_DETECT);
+ /*
+ * Let's try to get the PCMCIA module for 16-bit PCMCIA support.
+ * If it fails, it doesn't matter -- we still have 32-bit CardBus
+ * support to offer, so this is not a failure mode.
+ */
+ request_module_nowait("pcmcia");
+
return 0;
err: