diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-07 06:26:17 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 02:30:17 -0500 |
commit | 638bba55fe6440439005f02fcd6b0c1f908d0d11 (patch) | |
tree | 84952104cf985248738106eabfc71b205f0b85ba /drivers/pcmcia | |
parent | 55a19b39acb8888af8e9cfe5b762d03c52fdb48c (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')
-rw-r--r-- | drivers/pcmcia/cs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index b229f6d9e443..fc1c0c6baae2 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
@@ -243,6 +243,13 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) | |||
243 | 243 | ||
244 | pcmcia_parse_events(socket, SS_DETECT); | 244 | pcmcia_parse_events(socket, SS_DETECT); |
245 | 245 | ||
246 | /* | ||
247 | * Let's try to get the PCMCIA module for 16-bit PCMCIA support. | ||
248 | * If it fails, it doesn't matter -- we still have 32-bit CardBus | ||
249 | * support to offer, so this is not a failure mode. | ||
250 | */ | ||
251 | request_module_nowait("pcmcia"); | ||
252 | |||
246 | return 0; | 253 | return 0; |
247 | 254 | ||
248 | err: | 255 | err: |