From aa93a28f1ec3bafece77e4e75b2fb90cb25c81ab Mon Sep 17 00:00:00 2001 From: Abhijeet Dharmapurikar Date: Fri, 15 Jan 2016 12:08:16 -0800 Subject: [PATCH] regulator: rpm-smd-regulator: pass descriptor to init_data parsing function The regulator registration api's need a descriptor to access mode matching functions. rpm-smd-regulators don't use that feature. Pass in a descriptor with that function pointer set to NULL. Change-Id: I4a23021e004fa749715c246e4685df8c5b75131f Signed-off-by: Abhijeet Dharmapurikar --- drivers/regulator/rpm-smd-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/rpm-smd-regulator.c b/drivers/regulator/rpm-smd-regulator.c index 042884f3d23e..b38db82c0b0b 100644 --- a/drivers/regulator/rpm-smd-regulator.c +++ b/drivers/regulator/rpm-smd-regulator.c @@ -1636,7 +1636,7 @@ static int rpm_vreg_device_probe(struct platform_device *pdev) reg->set_active = !!(val & RPM_SET_CONFIG_ACTIVE); reg->set_sleep = !!(val & RPM_SET_CONFIG_SLEEP); - init_data = of_get_regulator_init_data(dev, node); + init_data = of_get_regulator_init_data(dev, node, ®->rdesc); if (init_data == NULL) { dev_err(dev, "%s: unable to allocate memory\n", __func__); rc = -ENOMEM;