diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-15 22:05:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-15 22:05:34 -0500 |
| commit | aac0c29d4b8418c5c78b552070ffeda022b16949 (patch) | |
| tree | 1f539113f2121d84b6f62421a066505d753a2fdc /drivers/net/sandbox-raw.c | |
| parent | f4cfd73943032729c9ad6ddd054bcf2ff8205b6d (diff) | |
| parent | f51f6715a5013f37620c38f0430e21d4736e235a (diff) | |
Merge tag 'dm-pull-15jan19' of git://git.denx.de/u-boot-dm
Fix recent changes to serial API for driver model
Buildman clang support and a few fixes
Small fixes to 'dm tree' and regmap test
Improve sandbox build compatibility
A few other minor fixes
Diffstat (limited to 'drivers/net/sandbox-raw.c')
| -rw-r--r-- | drivers/net/sandbox-raw.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c index 09cc678ebd..7e6625d020 100644 --- a/drivers/net/sandbox-raw.c +++ b/drivers/net/sandbox-raw.c @@ -152,7 +152,6 @@ static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev) struct eth_pdata *pdata = dev_get_platdata(dev); struct eth_sandbox_raw_priv *priv = dev_get_priv(dev); const char *ifname; - u32 local; int ret; pdata->iobase = dev_read_addr(dev); @@ -173,10 +172,10 @@ static int sb_eth_raw_ofdata_to_platdata(struct udevice *dev) priv->host_ifindex, priv->host_ifname); } - local = sandbox_eth_raw_os_is_local(priv->host_ifname); - if (local < 0) - return local; - priv->local = local; + ret = sandbox_eth_raw_os_is_local(priv->host_ifname); + if (ret < 0) + return ret; + priv->local = ret; return 0; } |