From aa425cfbde23ffd7f27803660ca97972ae964ed5 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Wed, 25 Feb 2009 22:29:29 +0100
Subject: [PATCH] --- yaml --- r: 133171 b: refs/heads/master c:
 5d44aa4c7322e0cda6d71cc3f0dffaceea0daae5 h: refs/heads/master i:   133169:
 fec20d9cc278fcf8933a9a5bd8fd29aee9581a9b   133167:
 9b0fc66c83c724701dddbd8f8bf4f847d368b793 v: v3

---
 [refs]                |  2 +-
 trunk/sound/oss/pss.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ebedf887dcab..364bb7b30c37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eca985d28e1a8092ba2686ec5485fd688df5cfb3
+refs/heads/master: 5d44aa4c7322e0cda6d71cc3f0dffaceea0daae5
diff --git a/trunk/sound/oss/pss.c b/trunk/sound/oss/pss.c
index 16ed06950dc1..16517a5a1301 100644
--- a/trunk/sound/oss/pss.c
+++ b/trunk/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;