diff mbox series

[v2] media: i2c: ad5820: Fix error path

Message ID 20220921-ad5820-v2-0-3e5cabb04786@chromium.org
State New
Headers
Series [v2] media: i2c: ad5820: Fix error path |

Commit Message

Ricardo Ribalda Dec. 2, 2022, 4:35 p.m. UTC 
  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>
---
media: i2c: ad5280: Fix error path

While revieweing dev_err_probe() series I found something weird,
lets try to fix it.

To: Pavel Machek <pavel@ucw.cz>
To: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Pali Rohar <pali@kernel.org>
Cc: linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Changes in v2:
- Rebase on top of linux-master
- Remove non-ascii chars from To:
- Link to v1: https://lore.kernel.org/r/20220921-ad5820-v1-0-871c517d69fc@chromium.org
---
 drivers/media/i2c/ad5820.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


---
base-commit: a4412fdd49dc011bcc2c0d81ac4cab7457092650
change-id: 20220921-ad5820-73d40ca9f707

Best regards,

Comments

Sakari Ailus Dec. 5, 2022, 9:58 a.m. UTC | #1 
Hi Ricardo,

On Fri, Dec 02, 2022 at 05:35:59PM +0100, Ricardo Ribalda wrote:
> 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>

I'm afraid v1 has already been merged. But I understand patch content
wasn't really different so that should be fine.
Ricardo Ribalda Dec. 5, 2022, 9:59 a.m. UTC | #2 
On Mon, 5 Dec 2022 at 10:58, Sakari Ailus <sakari.ailus@linux.intel.com> wrote:
>
> Hi Ricardo,
>
> On Fri, Dec 02, 2022 at 05:35:59PM +0100, Ricardo Ribalda wrote:
> > 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>
>
> I'm afraid v1 has already been merged. But I understand patch content
> wasn't really different so that should be fine.

Sorry I missed that :)

Thanks!


>
> --
> Kind regards,
>
> Sakari Ailus
diff mbox series

Patch

diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c
index 516de278cc49..a12fedcc3a1c 100644
--- 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;
 }