diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-07 04:44:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-07 04:44:57 +0300 |
| commit | 13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch) | |
| tree | 1bf30874f57c6c6b21160a10282191fcd0868055 /arch/mips/cavium-octeon | |
| parent | 05bb520376af2c5146d3c44832c22ec3bb54d778 (diff) | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
| download | linux-13dfb3fa494361ea9a5950f27c9cd8b06d28c04f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/mips/cavium-octeon')
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/arch/mips/cavium-octeon/octeon-usb.c index 1f730ded5224..cc88a08bc1f7 100644 --- a/arch/mips/cavium-octeon/octeon-usb.c +++ b/arch/mips/cavium-octeon/octeon-usb.c @@ -398,6 +398,7 @@ static int dwc3_octeon_clocks_start(struct device *dev, u64 base) default: dev_err(dev, "Invalid ref_clk %u, using 100000000 instead\n", clock_rate); + /* fall through */ case 100000000: mpll_mul = 0x19; if (ref_clk_sel < 2) |