Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next (7daf390b) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/wm0010.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/interrupt.h>
		#include <linux/irqreturn.h>
		#include <linux/init.h>
		#include <linux/spi/spi.h>
		@@ -972,6 +973,13 @@ static int wm0010_spi_probe(struct spi_device *spi)
		}
		wm0010->irq = irq;

		ret = irq_set_irq_wake(irq, 1);
		if (ret) {
		dev_err(wm0010->dev, "Failed to set IRQ %d as wake source: %d\n",
		irq, ret);
		return ret;
		}

		if (spi->max_speed_hz)
		wm0010->board_max_spi_speed = spi->max_speed_hz;
		else
		@@ -995,6 +1003,8 @@ static int wm0010_spi_remove(struct spi_device *spi)
		gpio_set_value_cansleep(wm0010->gpio_reset,
		wm0010->gpio_reset_value);

		irq_set_irq_wake(wm0010->irq, 0);

		if (wm0010->irq)
		free_irq(wm0010->irq, wm0010);