diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-04 12:22:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-04 12:22:31 -0700 |
commit | 8eb6dcf9d2b15bb1ac066d378e503f79efcbe65c (patch) | |
tree | f3da1aeb272f2f1038c08bc9cc8f39d0cd4d4af1 /drivers/staging/iio/magnetometer/hmc5843_core.c | |
parent | eca8258be3e60c88383aa439751d3e2069b56241 (diff) | |
parent | dce5bdfe8fc1e3b49fa6fcf21e07bb12360e1b98 (diff) | |
download | op-kernel-dev-8eb6dcf9d2b15bb1ac066d378e503f79efcbe65c.zip op-kernel-dev-8eb6dcf9d2b15bb1ac066d378e503f79efcbe65c.tar.gz |
Merge tag 'staging-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are some staging driver fixes, well, really all just IIO driver
fixes, for 4.0-rc6. They fix issues that have been reported with
these drivers.
All of these patches have been in linux-next for a while"
* tag 'staging-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
iio: imu: Use iio_trigger_get for indio_dev->trig assignment
iio: adc: vf610: use ADC clock within specification
iio/adc/cc10001_adc.c: Fix !HAS_IOMEM build
iio: core: Fix double free.
iio:inv-mpu6050: Fix inconsistency for the scale channel
staging: iio: dummy: Fix undefined symbol build error
iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo
staging: iio: hmc5843: Set iio name property in sysfs
iio: bmc150: change sampling frequency
iio: fix drivers that check buffer->scan_mask
Diffstat (limited to 'drivers/staging/iio/magnetometer/hmc5843_core.c')
-rw-r--r-- | drivers/staging/iio/magnetometer/hmc5843_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/iio/magnetometer/hmc5843_core.c b/drivers/staging/iio/magnetometer/hmc5843_core.c index fd171d8..90cc18b 100644 --- a/drivers/staging/iio/magnetometer/hmc5843_core.c +++ b/drivers/staging/iio/magnetometer/hmc5843_core.c @@ -592,6 +592,7 @@ int hmc5843_common_probe(struct device *dev, struct regmap *regmap, mutex_init(&data->lock); indio_dev->dev.parent = dev; + indio_dev->name = dev->driver->name; indio_dev->info = &hmc5843_info; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = data->variant->channels; |