From: Ulrich Hecht Date: Thu, 22 Sep 2016 13:19:00 +0000 (-0300) Subject: [media] media: adv7604: automatic "default-input" selection X-Git-Tag: v4.10-rc1~71^2^2~332 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c57a68a152dc7e2d0631acb9d3c00d1c33ddecfb;p=karo-tx-linux.git [media] media: adv7604: automatic "default-input" selection Documentation states that the "default-input" property should reside directly in the node of the device. This adjusts the parsing to make the implementation consistent with the documentation. Based on patch by William Towle . Signed-off-by: Ulrich Hecht Signed-off-by: Hans Verkuil Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index 4003831de712..fa7046ef09b2 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -3074,13 +3074,13 @@ static int adv76xx_parse_dt(struct adv76xx_state *state) return ret; } - if (!of_property_read_u32(endpoint, "default-input", &v)) + of_node_put(endpoint); + + if (!of_property_read_u32(np, "default-input", &v)) state->pdata.default_input = v; else state->pdata.default_input = -1; - of_node_put(endpoint); - flags = bus_cfg.bus.parallel.flags; if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)