summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-08 17:25:56 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-08 17:25:56 +0200
commit779ae5a08368c423f0c3b6075a518356eacd41f6 (patch)
tree60c9fd6d60f02b253f42ae3ac90271116bd7ce4c /sound
parenta2e888f0d7cf6f2011740acb1f310bcc959c2842 (diff)
downloadop-kernel-dev-779ae5a08368c423f0c3b6075a518356eacd41f6.zip
op-kernel-dev-779ae5a08368c423f0c3b6075a518356eacd41f6.tar.gz
ALSA: Fix the card number limit of OSS-emulation
There are left-over codes from the ancient days with the static device number limitation of 8. Actaully OSS can support up to 16 cards. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/sound_oss.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index c700920..e952833 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -35,7 +35,7 @@
#include <linux/sound.h>
#include <linux/mutex.h>
-#define SNDRV_OSS_MINORS 128
+#define SNDRV_OSS_MINORS 256
static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS];
static DEFINE_MUTEX(sound_oss_mutex);
@@ -111,7 +111,7 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev,
int register1 = -1, register2 = -1;
struct device *carddev = snd_card_get_device_link(card);
- if (card && card->number >= 8)
+ if (card && card->number >= SNDRV_MINOR_OSS_DEVICES)
return 0; /* ignore silently */
if (minor < 0)
return minor;
@@ -170,7 +170,7 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
int track2 = -1;
struct snd_minor *mptr;
- if (card && card->number >= 8)
+ if (card && card->number >= SNDRV_MINOR_OSS_DEVICES)
return 0;
if (minor < 0)
return minor;
OpenPOWER on IntegriCloud