aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm2835-audio/bcm2835-ctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/bcm2835-audio/bcm2835-ctl.c')
-rw-r--r--drivers/staging/bcm2835-audio/bcm2835-ctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/bcm2835-audio/bcm2835-ctl.c
index 164daa4c723c..a4ffa1bf53e5 100644
--- a/drivers/staging/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/bcm2835-audio/bcm2835-ctl.c
@@ -164,8 +164,7 @@ static struct snd_kcontrol_new snd_bcm2835_ctl[] = {
.get = snd_bcm2835_ctl_get,
.put = snd_bcm2835_ctl_put,
.count = 1,
- .tlv =
- {.p = snd_bcm2835_db_scale}
+ .tlv = {.p = snd_bcm2835_db_scale}
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -210,7 +209,7 @@ static int snd_bcm2835_spdif_default_get(struct snd_kcontrol *kcontrol,
for (i = 0; i < 4; i++)
ucontrol->value.iec958.status[i] =
- (chip->spdif_status >> (i * 8)) && 0xff;
+ (chip->spdif_status >> (i * 8)) & 0xff;
mutex_unlock(&chip->audio_mutex);
return 0;