media: pxa_camera: Fix an error handling path in pxa_camera_probe()

tititiou36 · Hans Verkuil · commit 760d03f90bf3 · 2023-10-02T10:02:53.000+02:00
The commit in Fixes has reordered the code and the error handling path. However one 'goto' was missed. Fix it and branch at the correct place in the error handling path. Fixes: 5073d10 ("media: pxa_camera: Register V4L2 device early") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
diff --git a/drivers/media/platform/intel/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c
@@ -2398,7 +2398,7 @@ static int pxa_camera_probe(struct platform_device *pdev)
 			       PXA_CAM_DRV_NAME, pcdev);
 	if (err) {
 		dev_err(&pdev->dev, "Camera interrupt register failed\n");
-		goto exit_v4l2_device_unregister;
+		goto exit_deactivate;
 	}
 
 	pcdev->notifier.ops = &pxa_camera_sensor_ops;

Original file line number	Diff line number	Diff line change
`@@ -2398,7 +2398,7 @@ static int pxa_camera_probe(struct platform_device *pdev)`
`2398`	`2398`	`PXA_CAM_DRV_NAME, pcdev);`
`2399`	`2399`	`if (err) {`
`2400`	`2400`	`dev_err(&pdev->dev, "Camera interrupt register failed\n");`
`2401`		`- goto exit_v4l2_device_unregister;`
	`2401`	`+ goto exit_deactivate;`
`2402`	`2402`	`}`
`2403`	`2403`
`2404`	`2404`	`pcdev->notifier.ops = &pxa_camera_sensor_ops;`