diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-08-24 14:21:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-25 16:52:44 -0700 |
| commit | 9a0a5c4cb1af98b625dcefd72e987ca4929db71d (patch) | |
| tree | 3f3e05f8206d766a367779e669d0c146ed910f18 /drivers/net/ethernet/broadcom | |
| parent | eb60a8ddf3c38959cc73821bec5335bed85e0200 (diff) | |
| download | blackbird-obmc-linux-9a0a5c4cb1af98b625dcefd72e987ca4929db71d.tar.gz blackbird-obmc-linux-9a0a5c4cb1af98b625dcefd72e987ca4929db71d.zip | |
net: systemport: Fix ordering in intrl2_*_mask_clear macro
Since we keep shadow copies of which interrupt sources are enabled
through the intrl2_*_mask_{set,clear} macros, make sure that the
ordering in which we do these two operations: update the copy, then
unmask the register is correct.
This is not currently a problem because we actually do not use them, but
we will in a subsequent patch optimizing register accesses, so better be
safe here.
Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index b2d30863caeb..2059911014db 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -58,8 +58,8 @@ BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET); static inline void intrl2_##which##_mask_clear(struct bcm_sysport_priv *priv, \ u32 mask) \ { \ - intrl2_##which##_writel(priv, mask, INTRL2_CPU_MASK_CLEAR); \ priv->irq##which##_mask &= ~(mask); \ + intrl2_##which##_writel(priv, mask, INTRL2_CPU_MASK_CLEAR); \ } \ static inline void intrl2_##which##_mask_set(struct bcm_sysport_priv *priv, \ u32 mask) \ |
