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();