diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:14 +0100 |
commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/core/sound.c | |
parent | 29abceb67f8a230da806db4ed73899595bd2ae76 (diff) | |
parent | 8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff) | |
download | kernel_i9300_mainline-627b79628f56c3deeb17dec1edf6899b49552fa4.zip kernel_i9300_mainline-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz kernel_i9300_mainline-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2 |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/core/sound.c')
-rw-r--r-- | sound/core/sound.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c index 828af35..28f3559 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -229,6 +229,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev) case SNDRV_DEVICE_TYPE_RAWMIDI: case SNDRV_DEVICE_TYPE_PCM_PLAYBACK: case SNDRV_DEVICE_TYPE_PCM_CAPTURE: + case SNDRV_DEVICE_TYPE_COMPRESS: if (snd_BUG_ON(!card)) return -EINVAL; minor = SNDRV_MINOR(card->number, type + dev); |