diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/core/info_oss.c | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/core/info_oss.c')
| -rw-r--r-- | sound/core/info_oss.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c index e35789a92752..e4af138d651a 100644 --- a/sound/core/info_oss.c +++ b/sound/core/info_oss.c | |||
| @@ -43,8 +43,10 @@ int snd_oss_info_register(int dev, int num, char *string) | |||
| 43 | { | 43 | { |
| 44 | char *x; | 44 | char *x; |
| 45 | 45 | ||
| 46 | snd_assert(dev >= 0 && dev < SNDRV_OSS_INFO_DEV_COUNT, return -ENXIO); | 46 | if (snd_BUG_ON(dev < 0 || dev >= SNDRV_OSS_INFO_DEV_COUNT)) |
| 47 | snd_assert(num >= 0 && num < SNDRV_CARDS, return -ENXIO); | 47 | return -ENXIO; |
| 48 | if (snd_BUG_ON(num < 0 || num >= SNDRV_CARDS)) | ||
| 49 | return -ENXIO; | ||
| 48 | mutex_lock(&strings); | 50 | mutex_lock(&strings); |
| 49 | if (string == NULL) { | 51 | if (string == NULL) { |
| 50 | if ((x = snd_sndstat_strings[num][dev]) != NULL) { | 52 | if ((x = snd_sndstat_strings[num][dev]) != NULL) { |