Commit 1436a78c authored Sep 17, 2019 by Marco Felsch Committed by Jonathan Cameron Oct 09, 2019

iio: light: fix vcnl4000 devicetree hooks



Since commit ebd457d5 ("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: ebd457d5 ("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>

parent fdb828e2

drivers/iio/light/vcnl4000.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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,
		},
		{},
		};