diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 02:48:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 02:48:22 -0400 |
| commit | 0d7e92da50763b53b59b490ce57a323039ee241d (patch) | |
| tree | 9a1ee0292fce0243406f2e66c170d25e062730a2 /sound/core | |
| parent | c027a474a68065391c8773f6e83ed5412657e369 (diff) | |
| parent | 9f3b24948f22e4e21e961bd514c2089d24f0938e (diff) | |
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, | |||
| 342 | kfree(bufs); | 342 | kfree(bufs); |
| 343 | return -EFAULT; | 343 | return -EFAULT; |
| 344 | } | 344 | } |
| 345 | bufs[ch] = compat_ptr(ptr); | 345 | bufs[i] = compat_ptr(ptr); |
| 346 | bufptr++; | 346 | bufptr++; |
| 347 | } | 347 | } |
| 348 | if (dir == SNDRV_PCM_STREAM_PLAYBACK) | 348 | 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 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/log2.h> | 26 | #include <linux/log2.h> |
| 27 | #include <sound/core.h> | 27 | #include <sound/core.h> |
| 28 | #include <sound/timer.h> | 28 | #include <sound/timer.h> |