summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 14:56:09 +0300
committerMark Brown <broonie@kernel.org>2018-01-18 14:56:09 +0300
commit4c2223d43d875aa973544c61f6d1b7951dceeae5 (patch)
treea3e8b93bf67731f3823fbbbdd3181bc41916d64d /sound/soc
parent7cc289b9c689fcb2ba695317319e61720dcd73ba (diff)
parent65a12b3aafed5fc59f4ce41b22b752b1729e6701 (diff)
downloadlinux-4c2223d43d875aa973544c61f6d1b7951dceeae5.tar.xz
Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/nuc900/nuc900-ac97.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index b6615affe571..81b09d740ed9 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
/* polling the AC_R_FINISH */
while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH)
- && timeout--)
+ && --timeout)
mdelay(1);
if (!timeout) {
@@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
/* polling the AC_W_FINISH */
while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH)
- && timeout--)
+ && --timeout)
mdelay(1);
if (!timeout)
@@ -345,11 +345,10 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
goto out;
}
- nuc900_audio->irq_num = platform_get_irq(pdev, 0);
- if (!nuc900_audio->irq_num) {
- ret = -EBUSY;
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
goto out;
- }
+ nuc900_audio->irq_num = ret;
nuc900_ac97_data = nuc900_audio;