ASoC: imx-ssi: do not call hrtimer_disable in trigger function (83926099) · Commits · 戴 / test

sound/soc/imx/imx-pcm-fiq.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ struct imx_pcm_runtime_data {
		struct hrtimer hrt;
		int poll_time_ns;
		struct snd_pcm_substream *substream;
		atomic_t running;
		};

		static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
		@@ -52,6 +53,9 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
		struct pt_regs regs;
		unsigned long delta;

		if (!atomic_read(&iprtd->running))
		return HRTIMER_NORESTART;

		get_fiq_regs(&regs);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		@@ -129,6 +133,7 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
		case SNDRV_PCM_TRIGGER_START:
		case SNDRV_PCM_TRIGGER_RESUME:
		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
		atomic_set(&iprtd->running, 1);
		hrtimer_start(&iprtd->hrt, ns_to_ktime(iprtd->poll_time_ns),
		HRTIMER_MODE_REL);
		if (++fiq_enable == 1)
		@@ -139,11 +144,11 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
		case SNDRV_PCM_TRIGGER_STOP:
		case SNDRV_PCM_TRIGGER_SUSPEND:
		case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
		hrtimer_cancel(&iprtd->hrt);
		atomic_set(&iprtd->running, 0);

		if (--fiq_enable == 0)
		disable_fiq(imx_pcm_fiq);


		break;
		default:
		return -EINVAL;
		@@ -190,6 +195,7 @@ static int snd_imx_open(struct snd_pcm_substream *substream)

		iprtd->substream = substream;

		atomic_set(&iprtd->running, 0);
		hrtimer_init(&iprtd->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
		iprtd->hrt.function = snd_hrtimer_callback;