diff options
| author | Greg Kroah-Hartman | 2015-05-18 22:52:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-05-18 22:52:44 +0200 |
| commit | 936a0cd52aa5d024c583e36e2f21bf6ec2e527e4 (patch) | |
| tree | 01cffc11361be7d671b71ba86463f6649b39d552 /drivers/iio/magnetometer/st_magn_core.c | |
| parent | staging: slicoss: fix occasionally writing out only half of a dma address (diff) | |
| parent | Linux 4.1-rc4 (diff) | |
| download | kernel-qcow2-linux-936a0cd52aa5d024c583e36e2f21bf6ec2e527e4.tar.gz kernel-qcow2-linux-936a0cd52aa5d024c583e36e2f21bf6ec2e527e4.tar.xz kernel-qcow2-linux-936a0cd52aa5d024c583e36e2f21bf6ec2e527e4.zip | |
Merge 4.1-rc4 into staging-next
We want the fixes in here for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/magnetometer/st_magn_core.c')
| -rw-r--r-- | drivers/iio/magnetometer/st_magn_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c index 73574d912e7c..b4bcfb790f49 100644 --- a/drivers/iio/magnetometer/st_magn_core.c +++ b/drivers/iio/magnetometer/st_magn_core.c @@ -485,6 +485,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev) indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &magn_info; + mutex_init(&mdata->tb.buf_lock); st_sensors_power_enable(indio_dev); |