media: i2c: ad5820: Fix error path

[ Upstream commit 9fce241660f37d9e95e93c0ae6fba8cfefa5797b ]

Error path seems to be swaped. Fix the order and provide some meaningful
names.

Fixes: bee3d5115611 ("[media] ad5820: Add driver for auto-focus coil")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c
index 2958a46944614eade6e1c7e5325cbe9fb9abaa07..07639ecc85aa86256765bb1d69f7b1157cb362de 100644 (file)
--- a/drivers/media/i2c/ad5820.c
+++ b/drivers/media/i2c/ad5820.c
@@ -327,18 +327,18 @@ static int ad5820_probe(struct i2c_client *client,
 
        ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
        if (ret < 0)
-               goto cleanup2;
+               goto clean_mutex;
 
        ret = v4l2_async_register_subdev(&coil->subdev);
        if (ret < 0)
-               goto cleanup;
+               goto clean_entity;
 
        return ret;
 
-cleanup2:
-       mutex_destroy(&coil->power_lock);
-cleanup:
+clean_entity:
        media_entity_cleanup(&coil->subdev.entity);
+clean_mutex:
+       mutex_destroy(&coil->power_lock);
        return ret;
 }