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

Commit 4c11a761 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 2620954d f1adf5be

include/sound/soc.h

+2 −1
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ struct snd_soc_jack_gpio { 
	struct snd_soc_jack *jack;

	struct delayed_work work;



	int (*jack_status_check)(void);

	void *data;

	int (*jack_status_check)(void *data);

};



struct snd_soc_jack {

sound/soc/soc-jack.c

+3 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio) 
		report = 0;



	if (gpio->jack_status_check)

		report = gpio->jack_status_check();

		report = gpio->jack_status_check(gpio->data);



	snd_soc_jack_report(jack, report, gpio->report);

}
@@ -342,7 +342,8 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, 
		gpio_export(gpios[i].gpio, false);



		/* Update initial jack status */

		snd_soc_jack_gpio_detect(&gpios[i]);

		schedule_delayed_work(&gpios[i].work,

				      msecs_to_jiffies(gpios[i].debounce_time));

	}



	return 0;