diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-22 18:36:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-22 18:36:40 +0200 |
| commit | 52a035235ed5a1392fc264bd614eb96d1ac97a3d (patch) | |
| tree | 5629ac1d5335fda9c303e7ed8092f353ec46ac4a | |
| parent | 856deb866d16e29bd65952e0289066f6078af773 (diff) | |
| parent | fdb29f4de1374483291232ae7515e5e7bb464762 (diff) | |
Merge tag 'iio-fixes-for-5.9b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
Jonathan writes:
2nd set of IIO fixes for the 5.9 cycle.
One of these fixes a regresison introduced this cycle, but if I am too late
sending this request, it can be queued up for the merge window.
ad7124: fix typo in device name exposed through sysfs.
qcom-spmi-adc: fix stray .c in driver name field.
* tag 'iio-fixes-for-5.9b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
iio: adc: qcom-spmi-adc5: fix driver name
iio: adc: ad7124: Fix typo in device name
| -rw-r--r-- | drivers/iio/adc/ad7124.c | 4 | ||||
| -rw-r--r-- | drivers/iio/adc/qcom-spmi-adc5.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c index 8dce06e9e69c..766c73333604 100644 --- a/drivers/iio/adc/ad7124.c +++ b/drivers/iio/adc/ad7124.c @@ -177,12 +177,12 @@ static const struct iio_chan_spec ad7124_channel_template = { static struct ad7124_chip_info ad7124_chip_info_tbl[] = { [ID_AD7124_4] = { - .name = "ad7127-4", + .name = "ad7124-4", .chip_id = CHIPID_AD7124_4, .num_inputs = 8, }, [ID_AD7124_8] = { - .name = "ad7127-8", + .name = "ad7124-8", .chip_id = CHIPID_AD7124_8, .num_inputs = 16, }, diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c index b4b73c9920b4..c10aa28be70a 100644 --- a/drivers/iio/adc/qcom-spmi-adc5.c +++ b/drivers/iio/adc/qcom-spmi-adc5.c @@ -982,7 +982,7 @@ static int adc5_probe(struct platform_device *pdev) static struct platform_driver adc5_driver = { .driver = { - .name = "qcom-spmi-adc5.c", + .name = "qcom-spmi-adc5", .of_match_table = adc5_match_table, }, .probe = adc5_probe, |