diff options
Diffstat (limited to 'sound/oss/pss.c')
-rw-r--r-- | sound/oss/pss.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 16ed06950dc1..83f5ee236b12 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * load the driver as it did in previous versions. | 46 | * load the driver as it did in previous versions. |
47 | * 04-07-1999: Anthony Barbachan <barbcode@xmen.cis.fordham.edu> | 47 | * 04-07-1999: Anthony Barbachan <barbcode@xmen.cis.fordham.edu> |
48 | * Added module parameter pss_firmware to allow the user to tell | 48 | * Added module parameter pss_firmware to allow the user to tell |
49 | * the driver where the fireware file is located. The default | 49 | * the driver where the firmware file is located. The default |
50 | * setting is the previous hardcoded setting "/etc/sound/pss_synth". | 50 | * setting is the previous hardcoded setting "/etc/sound/pss_synth". |
51 | * 00-03-03: Christoph Hellwig <chhellwig@infradead.org> | 51 | * 00-03-03: Christoph Hellwig <chhellwig@infradead.org> |
52 | * Adapted to module_init/module_exit | 52 | * Adapted to module_init/module_exit |
@@ -457,10 +457,9 @@ static void pss_mixer_reset(pss_confdata *devc) | |||
457 | } | 457 | } |
458 | } | 458 | } |
459 | 459 | ||
460 | static int set_volume_mono(unsigned __user *p, int *aleft) | 460 | static int set_volume_mono(unsigned __user *p, unsigned int *aleft) |
461 | { | 461 | { |
462 | int left; | 462 | unsigned int left, volume; |
463 | unsigned volume; | ||
464 | if (get_user(volume, p)) | 463 | if (get_user(volume, p)) |
465 | return -EFAULT; | 464 | return -EFAULT; |
466 | 465 | ||
@@ -471,10 +470,11 @@ static int set_volume_mono(unsigned __user *p, int *aleft) | |||
471 | return 0; | 470 | return 0; |
472 | } | 471 | } |
473 | 472 | ||
474 | static int set_volume_stereo(unsigned __user *p, int *aleft, int *aright) | 473 | static int set_volume_stereo(unsigned __user *p, |
474 | unsigned int *aleft, | ||
475 | unsigned int *aright) | ||
475 | { | 476 | { |
476 | int left, right; | 477 | unsigned int left, right, volume; |
477 | unsigned volume; | ||
478 | if (get_user(volume, p)) | 478 | if (get_user(volume, p)) |
479 | return -EFAULT; | 479 | return -EFAULT; |
480 | 480 | ||