diff options
author | David S. Miller | 2016-04-24 00:26:24 +0200 |
---|---|---|
committer | David S. Miller | 2016-04-24 00:51:33 +0200 |
commit | 1602f49b58abcb0d34a5f0a29d68e7c1769547aa (patch) | |
tree | 4848fb0ffbc581ff465fd9c9e5a5b10b06f09b68 /drivers/net/ethernet/renesas/ravb_main.c | |
parent | Merge branch 'geneve-vxlan-deps' (diff) | |
parent | Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abello... (diff) | |
download | kernel-qcow2-linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.tar.gz kernel-qcow2-linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.tar.xz kernel-qcow2-linux-1602f49b58abcb0d34a5f0a29d68e7c1769547aa.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were two cases of simple overlapping changes,
nothing serious.
In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas/ravb_main.c')
-rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 0f1b314f4d64..238b56feb1ce 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1854,6 +1854,9 @@ static int ravb_set_gti(struct net_device *ndev) rate = clk_get_rate(clk); clk_put(clk); + if (!rate) + return -EINVAL; + inc = 1000000000ULL << 20; do_div(inc, rate); |