mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-10 00:31:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'iio-fixes-for-5.9b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Browse Source 
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
This commit is contained in:
Greg Kroah-Hartman
2020-09-22 18:36:40 +02:00
parent 856deb866d fdb29f4de1
commit 52a035235e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iio/adc/ad7124.c
View File

@@ -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,
},

2
drivers/iio/adc/qcom-spmi-adc5.c
View File

@@ -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,