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

Commit e3a2efa6 authored by Patrik Sevallius's avatar Patrik Sevallius Committed by Takashi Iwai
Browse files

[ALSA] soc at91 minor bug fixes 



Found these two bugs while browsing through the code.  The first one is
a cut-n-paste bug, instead of disabling the clock when request_irq()
fails, it enabled it once more.  The second one fixes a debug printout,
AT91_SSC_IER is write only, AT91_SSC_IMR is readable (the printed string
actually says imr).

Frank Mandarino was busy so he asked me to send these to this list.

/Patrik

Signed-off-by: default avatarPatrik Sevallius <patrik.sevallius@enea.com>
Acked-by: default avatarFrank Mandarino <fmandarino@endrelia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 30a717f7

sound/soc/at91/at91-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream, 


		DBG("sr=%lx imr=%lx\n",

		    at91_ssc_read(params->ssc_base + AT91_SSC_SR),

		    at91_ssc_read(params->ssc_base + AT91_SSC_IER));

		    at91_ssc_read(params->ssc_base + AT91_SSC_IMR));

		break;



	case SNDRV_PCM_TRIGGER_STOP:

sound/soc/at91/at91-ssc.c

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static int at91_ssc_hw_params(struct snd_pcm_substream *substream, 
			printk(KERN_WARNING "at91-ssc: request_irq failure\n");



			DBG("Stopping pid %d clock\n", ssc_p->ssc.pid);

			at91_sys_write(AT91_PMC_PCER, 1<<ssc_p->ssc.pid);

			at91_sys_write(AT91_PMC_PCDR, 1<<ssc_p->ssc.pid);

			return ret;

		}