diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
| commit | a48f831d12934a5c001c68f4bb4dafa8c78e3feb (patch) | |
| tree | fba1b2be0e6ee6786f7ab8ab191a0091b19fd0e5 /drivers | |
| parent | aa45c51b965d907ab79f777500e616338fe7de31 (diff) | |
| parent | 1c8dc624f53580df32794c6f4a9a3d5030f892c3 (diff) | |
| download | barebox-a48f831d12934a5c001c68f4bb4dafa8c78e3feb.tar.gz barebox-a48f831d12934a5c001c68f4bb4dafa8c78e3feb.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/address.c | 2 | ||||
| -rw-r--r-- | drivers/video/tc358767.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 8018d78bcb..14db080417 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -314,7 +314,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, ranges = of_get_property(parent, rprop, &rlen); #if !defined(CONFIG_PPC) if (ranges == NULL) { - pr_err("OF: no ranges; cannot translate\n"); + pr_debug("OF: no ranges; cannot translate\n"); return 1; } #endif /* !defined(CONFIG_PPC) */ diff --git a/drivers/video/tc358767.c b/drivers/video/tc358767.c index 69afaa2ba9..d4749b15c7 100644 --- a/drivers/video/tc358767.c +++ b/drivers/video/tc358767.c @@ -1405,6 +1405,10 @@ static int tc_probe(struct device_d *dev) if (ret) goto err; + ret = tc_get_display_props(tc); + if (ret) + goto err; + /* Register DP AUX channel */ tc->adapter.master_xfer = tc_aux_i2c_xfer; tc->adapter.nr = -1; /* any free */ @@ -1417,10 +1421,6 @@ static int tc_probe(struct device_d *dev) goto err; } - ret = tc_get_display_props(tc); - if (ret) - goto err; - /* add vlp */ tc->vpl.node = dev->device_node; tc->vpl.ioctl = tc_ioctl; |