Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 305793
b: refs/heads/master
c: 779ae5a
h: refs/heads/master
i:
  305791: 3a31328
v: v3
  • Loading branch information
Takashi Iwai committed May 8, 2012
1 parent 233b87d commit 6de4aee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a2e888f0d7cf6f2011740acb1f310bcc959c2842
refs/heads/master: 779ae5a08368c423f0c3b6075a518356eacd41f6
6 changes: 3 additions & 3 deletions trunk/sound/core/sound_oss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6de4aee

Please sign in to comment.