From 9a57d72b94869ceb29f932e95cb39f0cc156ea1f Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Fri, 31 May 2019 16:11:35 -0400 Subject: [PATCH] media: mt9m111: No need to check for the regulator The regulator_get() function returns a regulator when it succeeds. There's no need to check whether the regulator is NULL later on. Signed-off-by: Sakari Ailus Reviewed-by: Marco Felsch Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/mt9m111.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c index 746d1345b505..bb19f8c346cb 100644 --- a/drivers/media/i2c/mt9m111.c +++ b/drivers/media/i2c/mt9m111.c @@ -984,11 +984,9 @@ static int mt9m111_power_on(struct mt9m111 *mt9m111) if (ret < 0) return ret; - if (mt9m111->regulator) { - ret = regulator_enable(mt9m111->regulator); - if (ret < 0) - return ret; - } + ret = regulator_enable(mt9m111->regulator); + if (ret < 0) + return ret; ret = mt9m111_resume(mt9m111); if (ret < 0) { @@ -1002,8 +1000,7 @@ static int mt9m111_power_on(struct mt9m111 *mt9m111) static void mt9m111_power_off(struct mt9m111 *mt9m111) { mt9m111_suspend(mt9m111); - if (mt9m111->regulator) - regulator_disable(mt9m111->regulator); + regulator_disable(mt9m111->regulator); v4l2_clk_disable(mt9m111->clk); } -- 2.30.2