diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-05 17:03:07 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-05 17:03:07 +0100 |
| commit | 76eb75be79b52a3c6ae1fd840083fa1a04458c1c (patch) | |
| tree | bb90a570be2b1f521913b6233e11bae841608ad0 /drivers/net/ethernet/renesas | |
| parent | packet: fix panic in __packet_set_timestamp on tpacket_v3 in tx mode (diff) | |
| parent | Merge tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs... (diff) | |
| download | linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.tar.xz linux-76eb75be79b52a3c6ae1fd840083fa1a04458c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/renesas')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index f2af5ee84b77..8a784dce45fa 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -815,6 +815,7 @@ static struct sh_eth_cpu_data sh7734_data = { .tsu = 1, .hw_crc = 1, .select_mii = 1, + .shift_rd0 = 1, }; /* SH7763 */ @@ -1653,7 +1654,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) else goto out; - if (!likely(mdp->irq_enabled)) { + if (unlikely(!mdp->irq_enabled)) { sh_eth_write(ndev, 0, EESIPR); goto out; } |