tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: mmp: Bring back registration of the device

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2114239

commit fbb5298bf1a7b71723cd2bb193642429ceb0fb84 upstream.

In commit 4af65141e3 ("media: marvell: cafe: Register V4L2 device
earlier"), a call to v4l2_device_register() was moved away from
mccic_register() into its caller, marvell/cafe's cafe_pci_probe().
This is not the only caller though -- there's also marvell/mmp.

Add v4l2_device_register() into mmpcam_probe() to unbreak the MMP camera
driver, in a fashion analogous to what's been done to the Cafe driver.
Same for the teardown path.

Fixes: 4af65141e3 ("media: marvell: cafe: Register V4L2 device earlier")
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: stable@vger.kernel.org # v6.6+
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Noah Wager <noah.wager@canonical.com>
Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
Lubomir Rintel
2024-12-31 20:04:34 +01:00
committed by Mehmet Basaran
parent da3414e1c1
commit ea1f895930
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/marvell/mmp-driver.c
+17 -4
View File
@@ -230,13 +230,23 @@ static int mmpcam_probe(struct platform_device *pdev)
mcam_init_clk(mcam); mcam_init_clk(mcam);
/*
* Register with V4L.
*/
ret = v4l2_device_register(mcam->dev, &mcam->v4l2_dev);
if (ret)
return ret;
/* /*
* Create a match of the sensor against its OF node. * Create a match of the sensor against its OF node.
*/ */
ep = fwnode_graph_get_next_endpoint(of_fwnode_handle(pdev->dev.of_node), ep = fwnode_graph_get_next_endpoint(of_fwnode_handle(pdev->dev.of_node),
NULL); NULL);
if (!ep) if (!ep) {
return -ENODEV; ret = -ENODEV;
goto out_v4l2_device_unregister;
}
v4l2_async_nf_init(&mcam->notifier, &mcam->v4l2_dev); v4l2_async_nf_init(&mcam->notifier, &mcam->v4l2_dev);
@@ -245,7 +255,7 @@ static int mmpcam_probe(struct platform_device *pdev)
fwnode_handle_put(ep); fwnode_handle_put(ep);
if (IS_ERR(asd)) { if (IS_ERR(asd)) {
ret = PTR_ERR(asd); ret = PTR_ERR(asd);
goto out; goto out_v4l2_device_unregister;
} }
/* /*
@@ -253,7 +263,7 @@ static int mmpcam_probe(struct platform_device *pdev)
*/ */
ret = mccic_register(mcam); ret = mccic_register(mcam);
if (ret) if (ret)
goto out; goto out_v4l2_device_unregister;
/* /*
* Add OF clock provider. * Add OF clock provider.
@@ -282,6 +292,8 @@ static int mmpcam_probe(struct platform_device *pdev)
return 0; return 0;
out: out:
mccic_shutdown(mcam); mccic_shutdown(mcam);
out_v4l2_device_unregister:
v4l2_device_unregister(&mcam->v4l2_dev);
return ret; return ret;
} }
@@ -292,6 +304,7 @@ static void mmpcam_remove(struct platform_device *pdev)
struct mcam_camera *mcam = &cam->mcam; struct mcam_camera *mcam = &cam->mcam;
mccic_shutdown(mcam); mccic_shutdown(mcam);
v4l2_device_unregister(&mcam->v4l2_dev);
pm_runtime_force_suspend(mcam->dev); pm_runtime_force_suspend(mcam->dev);
} }