 +		priv->pclk_rising_edge = true;
 +	if (of_property_read_bool(np, "maxim,pclk-falling-edge"))
 +		priv->pclk_rising_edge = false;
-+		if (of_property_read_u32(np, "maxim,timeout", &priv->timeout))
++	if (of_property_read_u32(np, "maxim,timeout", &priv->timeout))
 +		priv->timeout = 100;
 +
 +	dev_info(&client->dev, "LINKs=%d, LANES=%d, RESETB GPIO=%d, FSYNC mode=%s, FSYNC period=%d, PCLK edge=%s\n",

 	SOC_MBUS_PACKING_EXTEND16,
 	SOC_MBUS_PACKING_VARIABLE,
 	SOC_MBUS_PACKING_1_5X8,
-- 
1.9.1


+		return -EINVAL;
+
+	code->code = MEDIA_BUS_FMT_YUYV8_2X8;
+
+	return 0;
+}
+
+static int ov10635_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
+{
+	struct i2c_client *client = v4l2_get_subdevdata(sd);
+	struct ov10635_priv *priv = to_ov10635(client);
+
+	memcpy(edid->edid, priv->id, 5);
+
+	return 0;
+}
