[PATCH v4 12/13] media: i2c: imx214: Fix clock handling on probe error or remove

[André Apitzsch via B4 Relay]

From: André Apitzsch <g...@apitzsch.eu>

The driver should disable or unprepare the clock on probe error and on
removing the module.

Remove regulator_bulk_disable(), because it is called by
imx214_power_off().

Signed-off-by: André Apitzsch <g...@apitzsch.eu>
---
 drivers/media/i2c/imx214.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c
index 
d15422873e7ba0588914d78d3d26374d2769541c..0e587f0a44d941bd7d9230b56df18c08250e679e
 100644
--- a/drivers/media/i2c/imx214.c
+++ b/drivers/media/i2c/imx214.c
@@ -1340,7 +1340,7 @@ static int imx214_probe(struct i2c_client *client)
        v4l2_ctrl_handler_free(&imx214->ctrls);
 error_power_off:
        pm_runtime_disable(imx214->dev);
-       regulator_bulk_disable(IMX214_NUM_SUPPLIES, imx214->supplies);
+       imx214_power_off(dev);
 
        return ret;
 }
@@ -1356,6 +1356,8 @@ static void imx214_remove(struct i2c_client *client)
        v4l2_ctrl_handler_free(&imx214->ctrls);
 
        pm_runtime_disable(&client->dev);
+       if (!pm_runtime_status_suspended(&client->dev))
+               imx214_power_off(&client->dev);
        pm_runtime_set_suspended(&client->dev);
 }
 

-- 
2.47.1