git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sound: ensure device number is valid in snd_seq_oss_synth_make_info
[pandora-kernel.git]
/
sound
/
core
/
control_compat.c
diff --git
a/sound/core/control_compat.c
b/sound/core/control_compat.c
index
ab48962
..
6101259
100644
(file)
--- a/
sound/core/control_compat.c
+++ b/
sound/core/control_compat.c
@@
-219,7
+219,8
@@
static int copy_ctl_value_from_user(struct snd_card *card,
struct snd_ctl_elem_value32 __user *data32,
int *typep, int *countp)
{
struct snd_ctl_elem_value32 __user *data32,
int *typep, int *countp)
{
- int i, type, count, size;
+ int i, type, size;
+ int uninitialized_var(count);
unsigned int indirect;
if (copy_from_user(&data->id, &data32->id, sizeof(data->id)))
unsigned int indirect;
if (copy_from_user(&data->id, &data32->id, sizeof(data->id)))
@@
-392,7
+393,7
@@
enum {
static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
{
struct snd_ctl_file *ctl;
static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
{
struct snd_ctl_file *ctl;
- struct
list_head *list
;
+ struct
snd_kctl_ioctl *p
;
void __user *argp = compat_ptr(arg);
int err;
void __user *argp = compat_ptr(arg);
int err;
@@
-427,8
+428,7
@@
static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, uns
}
down_read(&snd_ioctl_rwsem);
}
down_read(&snd_ioctl_rwsem);
- list_for_each(list, &snd_control_compat_ioctls) {
- struct snd_kctl_ioctl *p = list_entry(list, struct snd_kctl_ioctl, list);
+ list_for_each_entry(p, &snd_control_compat_ioctls, list) {
if (p->fioctl) {
err = p->fioctl(ctl->card, ctl, cmd, arg);
if (err != -ENOIOCTLCMD) {
if (p->fioctl) {
err = p->fioctl(ctl->card, ctl, cmd, arg);
if (err != -ENOIOCTLCMD) {