Commit 52a03523 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'iio-fixes-for-5.9b-take2' of...

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
parents 856deb86 fdb29f4d
...@@ -177,12 +177,12 @@ static const struct iio_chan_spec ad7124_channel_template = { ...@@ -177,12 +177,12 @@ static const struct iio_chan_spec ad7124_channel_template = {
static struct ad7124_chip_info ad7124_chip_info_tbl[] = { static struct ad7124_chip_info ad7124_chip_info_tbl[] = {
[ID_AD7124_4] = { [ID_AD7124_4] = {
.name = "ad7127-4", .name = "ad7124-4",
.chip_id = CHIPID_AD7124_4, .chip_id = CHIPID_AD7124_4,
.num_inputs = 8, .num_inputs = 8,
}, },
[ID_AD7124_8] = { [ID_AD7124_8] = {
.name = "ad7127-8", .name = "ad7124-8",
.chip_id = CHIPID_AD7124_8, .chip_id = CHIPID_AD7124_8,
.num_inputs = 16, .num_inputs = 16,
}, },
......
...@@ -982,7 +982,7 @@ static int adc5_probe(struct platform_device *pdev) ...@@ -982,7 +982,7 @@ static int adc5_probe(struct platform_device *pdev)
static struct platform_driver adc5_driver = { static struct platform_driver adc5_driver = {
.driver = { .driver = {
.name = "qcom-spmi-adc5.c", .name = "qcom-spmi-adc5",
.of_match_table = adc5_match_table, .of_match_table = adc5_match_table,
}, },
.probe = adc5_probe, .probe = adc5_probe,
......
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