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

Commit 431adc0a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-4.6c' of... 

Merge tag 'iio-fixes-for-4.6c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

3rd set of IIO fixes for the 4.6 cycle.

* ak8975
  - fix a null pointer exception if an interrupt occurs during probe.
  - fix a maybe-unitialized warning.
* at91-sama5d2
  - fix a crash on removal of the module.
parents bf162006 8e6cb470

drivers/iio/adc/at91-sama5d2_adc.c

+2 −0
Original line number Diff line number Diff line
@@ -451,6 +451,8 @@ static int at91_adc_probe(struct platform_device *pdev) 
	if (ret)

		goto vref_disable;



	platform_set_drvdata(pdev, indio_dev);



	ret = iio_device_register(indio_dev);

	if (ret < 0)

		goto per_clk_disable_unprepare;

drivers/iio/magnetometer/ak8975.c

+3 −3
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ static int ak8975_setup_irq(struct ak8975_data *data) 
	int rc;

	int irq;



	init_waitqueue_head(&data->data_ready_queue);

	clear_bit(0, &data->flags);

	if (client->irq)

		irq = client->irq;

	else
@@ -477,8 +479,6 @@ static int ak8975_setup_irq(struct ak8975_data *data) 
		return rc;

	}



	init_waitqueue_head(&data->data_ready_queue);

	clear_bit(0, &data->flags);

	data->eoc_irq = irq;



	return rc;
@@ -732,7 +732,7 @@ static int ak8975_probe(struct i2c_client *client, 
	int eoc_gpio;

	int err;

	const char *name = NULL;

	enum asahi_compass_chipset chipset;

	enum asahi_compass_chipset chipset = AK_MAX_TYPE;



	/* Grab and set up the supplied GPIO. */

	if (client->dev.platform_data)