* [PATCH 4.19] media: da_vinci: fix code duplication due to missmerge
@ 2020-09-20 8:30 Pavel Machek
0 siblings, 0 replies; only message in thread
From: Pavel Machek @ 2020-09-20 8:30 UTC (permalink / raw)
To: stable, Greg KH, prabhakar.csengg, mchehab, linux-media
[-- Attachment #1: Type: text/plain, Size: 723 bytes --]
I'm not sure what went wrong there, but same block of code is there,
twice. Probably some kind of mis-merge.
Fix it.
Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1633,11 +1633,6 @@ static __init int vpif_probe(struct platform_device *pdev)
return -EINVAL;
}
- if (!pdev->dev.platform_data) {
- dev_warn(&pdev->dev, "Missing platform data. Giving up.\n");
- return -EINVAL;
- }
-
vpif_dev = &pdev->dev;
err = initialize_vpif();
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-20 8:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-20 8:30 [PATCH 4.19] media: da_vinci: fix code duplication due to missmerge Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).