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

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
...@@ -451,6 +451,8 @@ static int at91_adc_probe(struct platform_device *pdev) ...@@ -451,6 +451,8 @@ static int at91_adc_probe(struct platform_device *pdev)
if (ret) if (ret)
goto vref_disable; goto vref_disable;
platform_set_drvdata(pdev, indio_dev);
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret < 0) if (ret < 0)
goto per_clk_disable_unprepare; goto per_clk_disable_unprepare;
......
...@@ -462,6 +462,8 @@ static int ak8975_setup_irq(struct ak8975_data *data) ...@@ -462,6 +462,8 @@ static int ak8975_setup_irq(struct ak8975_data *data)
int rc; int rc;
int irq; int irq;
init_waitqueue_head(&data->data_ready_queue);
clear_bit(0, &data->flags);
if (client->irq) if (client->irq)
irq = client->irq; irq = client->irq;
else else
...@@ -477,8 +479,6 @@ static int ak8975_setup_irq(struct ak8975_data *data) ...@@ -477,8 +479,6 @@ static int ak8975_setup_irq(struct ak8975_data *data)
return rc; return rc;
} }
init_waitqueue_head(&data->data_ready_queue);
clear_bit(0, &data->flags);
data->eoc_irq = irq; data->eoc_irq = irq;
return rc; return rc;
...@@ -732,7 +732,7 @@ static int ak8975_probe(struct i2c_client *client, ...@@ -732,7 +732,7 @@ static int ak8975_probe(struct i2c_client *client,
int eoc_gpio; int eoc_gpio;
int err; int err;
const char *name = NULL; const char *name = NULL;
enum asahi_compass_chipset chipset; enum asahi_compass_chipset chipset = AK_MAX_TYPE;
/* Grab and set up the supplied GPIO. */ /* Grab and set up the supplied GPIO. */
if (client->dev.platform_data) if (client->dev.platform_data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment