Skip to contentSkip to conversation

media: da_vinci: fix code duplication due to missmerge

PATCH New Pavel Machek 1 participant 1 message Sep 20, 2020

Subsystems (2)
Stable branch Media (V4L/DVB)
lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

PATCH 1/1 media: da_vinci: fix code duplication due to missmerge

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) <[email protected]>
drivers/media/platform/davinci/vpif_capture.c +0 -5
@@ -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();
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html