diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 08:48:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 08:48:22 +0200 |
| commit | 0d7e92da50763b53b59b490ce57a323039ee241d (patch) | |
| tree | 9a1ee0292fce0243406f2e66c170d25e062730a2 /sound/core | |
| parent | oom: task->mm == NULL doesn't mean the memory was freed (diff) | |
| parent | Merge branch 'fix/asoc' into for-linus (diff) | |
| download | linux-0d7e92da50763b53b59b490ce57a323039ee241d.tar.xz linux-0d7e92da50763b53b59b490ce57a323039ee241d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: asihpi - Clarify adapter index validity check
ALSA: asihpi - Don't leak firmware if mem alloc fails
ALSA: rtctimer.c needs module.h
ASoC: Fix txx9aclc.c build
ALSA: hdspm - Add firmware revision 0xcc for RME MADI
ALSA: hdspm - Fix reported external sample rate on RME MADI and MADIface
ALSA: hdspm - Provide MADI speed mode selector on RME MADI and MADIface
ALSA: sound/core/pcm_compat.c: adjust array index
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_compat.c | 2 | ||||
| -rw-r--r-- | sound/core/rtctimer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c index 5fb2e28e796f..91cdf9435fec 100644 --- a/sound/core/pcm_compat.c +++ b/sound/core/pcm_compat.c @@ -342,7 +342,7 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream, kfree(bufs); return -EFAULT; } - bufs[ch] = compat_ptr(ptr); + bufs[i] = compat_ptr(ptr); bufptr++; } if (dir == SNDRV_PCM_STREAM_PLAYBACK) diff --git a/sound/core/rtctimer.c b/sound/core/rtctimer.c index 0851cd13e303..e85e72baff9e 100644 --- a/sound/core/rtctimer.c +++ b/sound/core/rtctimer.c @@ -22,7 +22,7 @@ #include <linux/init.h> #include <linux/interrupt.h> -#include <linux/moduleparam.h> +#include <linux/module.h> #include <linux/log2.h> #include <sound/core.h> #include <sound/timer.h> |