Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 4c2223d4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next

parents 7cc289b9 65a12b3a

sound/soc/nuc900/nuc900-ac97.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97, 




	/* polling the AC_R_FINISH */

	/* polling the AC_R_FINISH */

	while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH)

	while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH)

								&& timeout--)

								&& --timeout)

		mdelay(1);

		mdelay(1);





	if (!timeout) {

	if (!timeout) {
@@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 




	/* polling the AC_W_FINISH */

	/* polling the AC_W_FINISH */

	while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH)

	while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH)

								&& timeout--)

								&& --timeout)

		mdelay(1);

		mdelay(1);





	if (!timeout)

	if (!timeout)
@@ -345,11 +345,10 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) 
		goto out;

		goto out;

	}

	}





	nuc900_audio->irq_num = platform_get_irq(pdev, 0);

	ret = platform_get_irq(pdev, 0);

	if (!nuc900_audio->irq_num) {

	if (ret < 0)

		ret = -EBUSY;

		goto out;

		goto out;

	}

	nuc900_audio->irq_num = ret;





	nuc900_ac97_data = nuc900_audio;

	nuc900_ac97_data = nuc900_audio;