media: ivsc: Release csi_dev reference early in mei_ace_setup_dev_link()

Put the reference to csi_dev acquired during driver probe in
mei_ace_setup_dev_link() inside the same function, instead of during driver
unbind in mei_ace_remove(). This can be done as device_link_add() already
takes a reference to csi_dev.

Signed-off-by: Ma Ke <make24@iscas.ac.cn>
[Sakari Ailus: Rework commit message.]
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/pci/intel/ivsc/mei_ace.c b/drivers/media/pci/intel/ivsc/mei_ace.c
index 98310b8511b1ed59805291772309f5f39b01e5cd..b306a320b70ffaad6707361b26eed300a413937a 100644 (file)
--- a/drivers/media/pci/intel/ivsc/mei_ace.c
+++ b/drivers/media/pci/intel/ivsc/mei_ace.c
@@ -414,10 +414,11 @@ static int mei_ace_setup_dev_link(struct mei_ace *ace)
        /* setup link between mei_ace and mei_csi */
        ace->csi_link = device_link_add(csi_dev, dev, DL_FLAG_PM_RUNTIME |
                                        DL_FLAG_RPM_ACTIVE | DL_FLAG_STATELESS);
+       put_device(csi_dev);
        if (!ace->csi_link) {
                ret = -EINVAL;
                dev_err(dev, "failed to link to %s\n", dev_name(csi_dev));
-               goto err_put;
+               goto err;
        }
 
        ace->csi_dev = csi_dev;
@@ -522,7 +523,6 @@ static void mei_ace_remove(struct mei_cl_device *cldev)
        cancel_work_sync(&ace->work);
 
        device_link_del(ace->csi_link);
-       put_device(ace->csi_dev);
 
        pm_runtime_disable(&cldev->dev);
        pm_runtime_set_suspended(&cldev->dev);