[2/6] media: ivsc: csi: Clean up V4L2 async notifier on error
Commit Message
Clean up the V4L2 async notifier in error handling path, and add label to
unify handling.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Wentong Wu <wentong.wu@intel.com>
---
drivers/media/pci/intel/ivsc/mei_csi.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
@@ -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;
}