git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
sound
/
drivers
/
mpu401
/
mpu401.c
diff --git
a/sound/drivers/mpu401/mpu401.c
b/sound/drivers/mpu401/mpu401.c
index 915589a402ab3965232138ca693a1b670bde0b84..9d10d79e27afca0f9e3574497efe1816e137f269 100644
(file)
--- a/
sound/drivers/mpu401/mpu401.c
+++ b/
sound/drivers/mpu401/mpu401.c
@@
-240,8
+240,10
@@
static int __init alsa_card_mpu401_init(void)
return err;
devices = 0;
- for (i = 0; i < SNDRV_CARDS
&& enable[i]
; i++) {
+ for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device;
+ if (! enable[i])
+ continue;
#ifdef CONFIG_PNP
if (pnp[i])
continue;