mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 10:04:04 +02:00
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>
This commit is contained in:
parent
ebe5523ec3
commit
765abb76f5
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user