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
ALSA: hdsp: Fix wrong boolean ctl value accesses
[pandora-kernel.git]
/
sound
/
pci
/
rme9652
/
hdsp.c
diff --git
a/sound/pci/rme9652/hdsp.c
b/sound/pci/rme9652/hdsp.c
index
f742202
..
70ad128
100644
(file)
--- a/
sound/pci/rme9652/hdsp.c
+++ b/
sound/pci/rme9652/hdsp.c
@@
-26,7
+26,7
@@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/firmware.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/firmware.h>
-#include <linux/module
param
.h>
+#include <linux/module.h>
#include <linux/math64.h>
#include <sound/core.h>
#include <linux/math64.h>
#include <sound/core.h>
@@
-3163,7
+3163,7
@@
static int snd_hdsp_get_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ctl
{
struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
{
struct hdsp *hdsp = snd_kcontrol_chip(kcontrol);
- ucontrol->value.
enumerated.item
[0] = hdsp_dds_offset(hdsp);
+ ucontrol->value.
integer.value
[0] = hdsp_dds_offset(hdsp);
return 0;
}
return 0;
}
@@
-3175,7
+3175,7
@@
static int snd_hdsp_put_dds_offset(struct snd_kcontrol *kcontrol, struct snd_ctl
if (!snd_hdsp_use_is_exclusive(hdsp))
return -EBUSY;
if (!snd_hdsp_use_is_exclusive(hdsp))
return -EBUSY;
- val = ucontrol->value.
enumerated.item
[0];
+ val = ucontrol->value.
integer.value
[0];
spin_lock_irq(&hdsp->lock);
if (val != hdsp_dds_offset(hdsp))
change = (hdsp_set_dds_offset(hdsp, val) == 0) ? 1 : 0;
spin_lock_irq(&hdsp->lock);
if (val != hdsp_dds_offset(hdsp))
change = (hdsp_set_dds_offset(hdsp, val) == 0) ? 1 : 0;