diff options
author | Jan Blunck <jblunck@suse.de> | 2008-02-14 22:34:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:13:32 -0500 |
commit | 0d63e4f9ea61df1d727bd52a174aba732e6e1853 (patch) | |
tree | 70bde9b57a6081fed6ac22acbfc3298d79f94362 /sound/ppc | |
parent | 000cb48ee18165776b5a2beb72ed18f66bc61878 (diff) |
Dont touch fs_struct in drivers
The sound drivers and the pnpbios core test for current->root != NULL. This
test seems to be unnecessary since we always have rootfs mounted before
initializing the drivers.
Signed-off-by: Jan Blunck <jblunck@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: Takashi Iwai <tiwai@suse.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/daca.c | 5 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index 8432c16cd6ff..ca9452901a50 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
@@ -250,9 +250,8 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip) | |||
250 | struct pmac_daca *mix; | 250 | struct pmac_daca *mix; |
251 | 251 | ||
252 | #ifdef CONFIG_KMOD | 252 | #ifdef CONFIG_KMOD |
253 | if (current->fs->root) | 253 | request_module("i2c-powermac"); |
254 | request_module("i2c-powermac"); | 254 | #endif /* CONFIG_KMOD */ |
255 | #endif /* CONFIG_KMOD */ | ||
256 | 255 | ||
257 | mix = kzalloc(sizeof(*mix), GFP_KERNEL); | 256 | mix = kzalloc(sizeof(*mix), GFP_KERNEL); |
258 | if (! mix) | 257 | if (! mix) |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 71a7a9765429..3f8d7164cef9 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -1351,9 +1351,8 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1351 | char *chipname; | 1351 | char *chipname; |
1352 | 1352 | ||
1353 | #ifdef CONFIG_KMOD | 1353 | #ifdef CONFIG_KMOD |
1354 | if (current->fs->root) | 1354 | request_module("i2c-powermac"); |
1355 | request_module("i2c-powermac"); | 1355 | #endif /* CONFIG_KMOD */ |
1356 | #endif /* CONFIG_KMOD */ | ||
1357 | 1356 | ||
1358 | mix = kzalloc(sizeof(*mix), GFP_KERNEL); | 1357 | mix = kzalloc(sizeof(*mix), GFP_KERNEL); |
1359 | if (! mix) | 1358 | if (! mix) |