linux-next: manual merge of the staging tree with the v4l-dvb tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/media/platform/exynos4-is/fimc-is.c between commit d265d9ac6c7c
("[media] exynos4-is: Use external s5k6a3 sensor driver") from the
v4l-dvb tree and commit fd9fdb78a9bf ("[media] of: move graph helpers
from drivers/media/v4l2-core to drivers/of") from the staging tree.

I fixed it up (see below, though I suspect it is wasted?) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/media/platform/exynos4-is/fimc-is.c
index c289d5a69d09,9bdfa4599bc3..000000000000
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@@ -168,19 -167,11 +168,19 @@@ static int fimc_is_parse_sensor_config(
  	u32 tmp = 0;
  	int ret;
  
 -	np = of_graph_get_next_endpoint(np, NULL);
 -	if (!np)
 +	sensor->drvdata = fimc_is_sensor_get_drvdata(node);
 +	if (!sensor->drvdata) {
 +		dev_err(&is->pdev->dev, "no driver data found for: %s\n",
 +							 node->full_name);
 +		return -EINVAL;
 +	}
 +
- 	node = v4l2_of_get_next_endpoint(node, NULL);
++	node = of_graph_get_next_endpoint(node, NULL);
 +	if (!node)
  		return -ENXIO;
 -	np = of_graph_get_remote_port(np);
 -	if (!np)
 +
- 	node = v4l2_of_get_remote_port(node);
++	node = of_graph_get_remote_port(node);
 +	if (!node)
  		return -ENXIO;
  
  	/* Use MIPI-CSIS channel id to determine the ISP I2C bus index. */

Attachment: pgpJB1kvCnciJ.pgp
Description: PGP signature