| From 81b8ae61e5de4f3326f0cbf1e663f9458546f702 Mon Sep 17 00:00:00 2001 |
| From: Marco Felsch <m.felsch@pengutronix.de> |
| Date: Tue, 17 Sep 2019 16:56:36 +0200 |
| Subject: [PATCH] iio: light: fix vcnl4000 devicetree hooks |
| |
| commit 1436a78c63495dd94c8d4f84a76d78d5317d481b upstream. |
| |
| Since commit ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks") |
| the of_match_table is supported but the data shouldn't be a string. |
| Instead it shall be one of 'enum vcnl4000_device_ids'. Also the matching |
| logic for the vcnl4020 was wrong. Since the data retrieve mechanism is |
| still based on the i2c_device_id no failures did appeared till now. |
| |
| Fixes: ebd457d55911 ("iio: light: vcnl4000 add devicetree hooks") |
| Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> |
| Reviewed-by: Angus Ainslie (Purism) angus@akkea.ca |
| Cc: <Stable@vger.kernel.org> |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c |
| index 5b72fea9d743..c677ee21ce57 100644 |
| --- a/drivers/iio/light/vcnl4000.c |
| +++ b/drivers/iio/light/vcnl4000.c |
| @@ -398,19 +398,19 @@ static int vcnl4000_probe(struct i2c_client *client, |
| static const struct of_device_id vcnl_4000_of_match[] = { |
| { |
| .compatible = "vishay,vcnl4000", |
| - .data = "VCNL4000", |
| + .data = (void *)VCNL4000, |
| }, |
| { |
| .compatible = "vishay,vcnl4010", |
| - .data = "VCNL4010", |
| + .data = (void *)VCNL4010, |
| }, |
| { |
| - .compatible = "vishay,vcnl4010", |
| - .data = "VCNL4020", |
| + .compatible = "vishay,vcnl4020", |
| + .data = (void *)VCNL4010, |
| }, |
| { |
| .compatible = "vishay,vcnl4200", |
| - .data = "VCNL4200", |
| + .data = (void *)VCNL4200, |
| }, |
| {}, |
| }; |
| -- |
| 2.27.0 |
| |
