diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /sound/oss/sonicvibes.c | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'sound/oss/sonicvibes.c')
| -rw-r--r-- | sound/oss/sonicvibes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c index e1d69611a257..06047e7979af 100644 --- a/sound/oss/sonicvibes.c +++ b/sound/oss/sonicvibes.c | |||
| @@ -1149,7 +1149,7 @@ static int mixer_ioctl(struct sv_state *s, unsigned int cmd, unsigned long arg) | |||
| 1149 | if (mixtable[i].rec) | 1149 | if (mixtable[i].rec) |
| 1150 | break; | 1150 | break; |
| 1151 | } | 1151 | } |
| 1152 | if (!mixtable[i].rec) | 1152 | if (i == SOUND_MIXER_NRDEVICES) |
| 1153 | return 0; | 1153 | return 0; |
| 1154 | spin_lock_irqsave(&s->lock, flags); | 1154 | spin_lock_irqsave(&s->lock, flags); |
| 1155 | frobindir(s, SV_CIMIX_ADCINL, 0x1f, mixtable[i].rec << 5); | 1155 | frobindir(s, SV_CIMIX_ADCINL, 0x1f, mixtable[i].rec << 5); |