Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next
This commit is contained in:
commit
4c2223d43d
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue