diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:43 +0800 |
| commit | 6c1be3bf831c5b1f2ba51425315287df2c350633 (patch) | |
| tree | fd07371829b4b5ea7db114502ac12fd989aa4e2a /drivers/iio/magnetometer/ak8975.c | |
| parent | ada3625ee9203002b2cac60be802dae952ae3e22 (diff) | |
| parent | 3b6aa07b936b09d38c1bfcee1e06845b968df475 (diff) | |
Merge tag 'v3.18.34' into linux-linaro-lsk-v3.18lsk-v3.18-16.05
This is the 3.18.34 stable release
Diffstat (limited to 'drivers/iio/magnetometer/ak8975.c')
| -rw-r--r-- | drivers/iio/magnetometer/ak8975.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index bf5ef077e791..f03c3bf9a780 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -160,6 +160,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 @@ -175,8 +177,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; |