diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
| commit | 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (patch) | |
| tree | 1c990d9f2f91f6daabbf2de957bea744dd2bcb71 /sound/oss/pss.c | |
| parent | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (diff) | |
| parent | e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 (diff) | |
Merge branch 'topic/oss-fix' into for-linus
Diffstat (limited to 'sound/oss/pss.c')
| -rw-r--r-- | sound/oss/pss.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 16ed06950dc..16517a5a130 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c @@ -457,10 +457,9 @@ static void pss_mixer_reset(pss_confdata *devc) } } -static int set_volume_mono(unsigned __user *p, int *aleft) +static int set_volume_mono(unsigned __user *p, unsigned int *aleft) { - int left; - unsigned volume; + unsigned int left, volume; if (get_user(volume, p)) return -EFAULT; @@ -471,10 +470,11 @@ static int set_volume_mono(unsigned __user *p, int *aleft) return 0; } -static int set_volume_stereo(unsigned __user *p, int *aleft, int *aright) +static int set_volume_stereo(unsigned __user *p, + unsigned int *aleft, + unsigned int *aright) { - int left, right; - unsigned volume; + unsigned int left, right, volume; if (get_user(volume, p)) return -EFAULT; |