media: pxa_camera: remove an impossible condition
Subsystems (2)
PATCH 1/1 media: pxa_camera: remove an impossible condition
It's not possible for "pcdev->mclk" to be zero because we check for that earlier and set it to 20000000 in that situation. If it were possible, that would be a problem because it could have lead to an Oops in the error handling when we call v4l2_clk_unregister(pcdev->mclk_clk);
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/media/platform/pxa_camera.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/media/platform/pxa_camera.c +8 -11
@@ -2504,17 +2504,14 @@ static int pxa_camera_probe(struct platform_device *pdev)if (err) goto exit_notifier_cleanup; -if (pcdev->mclk) { -v4l2_clk_name_i2c (clk_name,sizeof (clk_name), - pcdev->asd.match.i2c.adapter_id, - pcdev->asd.match.i2c.address); - - pcdev->mclk_clk =v4l2_clk_register (&pxa_camera_mclk_ops, - clk_name,NULL ); -if (IS_ERR (pcdev->mclk_clk)) { - err =PTR_ERR (pcdev->mclk_clk); - goto exit_notifier_cleanup; - } +v4l2_clk_name_i2c (clk_name,sizeof (clk_name), + pcdev->asd.match.i2c.adapter_id, + pcdev->asd.match.i2c.address); + + pcdev->mclk_clk =v4l2_clk_register (&pxa_camera_mclk_ops, clk_name,NULL ); +if (IS_ERR (pcdev->mclk_clk)) { + err =PTR_ERR (pcdev->mclk_clk); + goto exit_notifier_cleanup; } err =v4l2_async_notifier_register (&pcdev->v4l2_dev, &pcdev->notifier);
Signature · 1 line
2.26.2
Quoted 6 lines · Dan Carpenter
It's not possible for "
pcdev->mclk" to be zero because we check for that earlier and set it to 20000000 in that situation. If it were possible, that would be a problem because it could have lead to an Oops in the error handling when we callv4l2_clk_unregister(pcdev->mclk_clk);Signed-off-by Dan Carpenter <[email protected]>
Acked-by Robert Jarzmik <[email protected]>
Cheers.
--
Robert