This is an automatic generated email to let you know that the following patch
were queued:
Subject: media: ivsc: csi: Clean up V4L2 async notifier on error
Author: Sakari Ailus <sakari.ai...@linux.intel.com>
Date: Mon Oct 16 10:23:22 2023 +0300
Clean up the V4L2 async notifier in error handling path, and add label to
unify handling.
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Tested-by: Wentong Wu <wentong...@intel.com>
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
drivers/media/pci/intel/ivsc/mei_csi.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c
b/drivers/media/pci/intel/ivsc/mei_csi.c
index 790b1101d579..19f1a47ba52d 100644
--- a/drivers/media/pci/intel/ivsc/mei_csi.c
+++ b/drivers/media/pci/intel/ivsc/mei_csi.c
@@ -672,16 +672,20 @@ static int mei_csi_parse_firmware(struct mei_csi *csi)
asd = v4l2_async_nf_add_fwnode(&csi->notifier, fwnode,
struct v4l2_async_connection);
+ fwnode_handle_put(fwnode);
if (IS_ERR(asd)) {
- fwnode_handle_put(fwnode);
- return PTR_ERR(asd);
+ ret = PTR_ERR(asd);
+ goto out_nf_cleanup;
}
- fwnode_handle_put(fwnode);
-
ret = v4l2_async_nf_register(&csi->notifier);
if (ret)
- v4l2_async_nf_cleanup(&csi->notifier);
+ goto out_nf_cleanup;
+
+ return 0;
+
+out_nf_cleanup:
+ v4l2_async_nf_cleanup(&csi->notifier);
return ret;
}
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
