Commit 9a848238 authored by Hans Verkuil's avatar Hans Verkuil
Browse files

Merge tag 'media-fixes-unicam-20240510' of... 

Merge tag 'media-fixes-unicam-20240510' of https://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux

 into media_stage

bcm2835-unicam fixes for v6.10

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.linuxtv.org/project/linux-media/patch/20240509222123.GA21033@pendragon.ideasonboard.com/
parents 48259b90 33108abc

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4039,7 +4039,7 @@ M: Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com> 
L:	linux-media@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml

F:	drivers/media/platform/bcm2835/

F:	drivers/media/platform/broadcom/bcm2835-unicam*









BROADCOM BCM47XX MIPS ARCHITECTURE









M:	Hauke Mehrtens <hauke@hauke-m.de>
































drivers/media/platform/broadcom/bcm2835-unicam.c



+5
−11






























Original line number
Diff line number
Diff line







@@ -2433,9 +2433,9 @@ static int unicam_async_bound(struct v4l2_async_notifier *notifier,







		return ret;



















	source = media_pad_remote_pad_unique(sink);









	if (!source) {









	if (IS_ERR(source)) {









		dev_err(unicam->dev, "No connected sensor pad\n");









		return -ENOTCONN;









		return PTR_ERR(source);









	}



















	unicam->sensor.subdev = subdev;








@@ -2661,17 +2661,13 @@ static int unicam_probe(struct platform_device *pdev)







	}



















	ret = platform_get_irq(pdev, 0);









	if (ret <= 0) {









		dev_err(&pdev->dev, "No IRQ resource\n");









		ret = -EINVAL;









	if (ret < 0)









		goto err_unicam_put;









	}



















	ret = devm_request_irq(&pdev->dev, ret, unicam_isr, 0,









			       "unicam_capture0", unicam);









	if (ret) {









		dev_err(&pdev->dev, "Unable to request interrupt\n");









		ret = -EINVAL;









		goto err_unicam_put;









	}


















@@ -2704,7 +2700,7 @@ static int unicam_probe(struct platform_device *pdev)







	return ret;









}



















static int unicam_remove(struct platform_device *pdev)









static void unicam_remove(struct platform_device *pdev)









{









	struct unicam_device *unicam = platform_get_drvdata(pdev);


















@@ -2718,8 +2714,6 @@ static int unicam_remove(struct platform_device *pdev)







	unicam_put(unicam);



















	pm_runtime_disable(&pdev->dev);



















	return 0;









}



















static const struct of_device_id unicam_of_match[] = {








@@ -2730,7 +2724,7 @@ MODULE_DEVICE_TABLE(of, unicam_of_match);

















static struct platform_driver unicam_driver = {









	.probe		= unicam_probe,









	.remove		= unicam_remove,









	.remove_new	= unicam_remove,









	.driver = {









		.name	= UNICAM_MODULE_NAME,









		.pm	= pm_ptr(&unicam_pm_ops),