diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/core/pcm_compat.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'sound/core/pcm_compat.c')
| -rw-r--r-- | sound/core/pcm_compat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c index 49aa693fba8..36d7a599823 100644 --- a/sound/core/pcm_compat.c +++ b/sound/core/pcm_compat.c | |||
| @@ -397,7 +397,8 @@ static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream, | |||
| 397 | snd_pcm_uframes_t boundary; | 397 | snd_pcm_uframes_t boundary; |
| 398 | int err; | 398 | int err; |
| 399 | 399 | ||
| 400 | snd_assert(runtime, return -EINVAL); | 400 | if (snd_BUG_ON(!runtime)) |
| 401 | return -EINVAL; | ||
| 401 | 402 | ||
| 402 | if (get_user(sflags, &src->flags) || | 403 | if (get_user(sflags, &src->flags) || |
| 403 | get_user(scontrol.appl_ptr, &src->c.control.appl_ptr) || | 404 | get_user(scontrol.appl_ptr, &src->c.control.appl_ptr) || |