diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2020-01-15 18:31:37 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2020-01-15 18:31:37 +0100 |
| commit | d02e5ee09bd98b8cec9c2e26b486ed4d6d1b7e2a (patch) | |
| tree | 7cb6fa45fd1cb4bdad89c7b7832a72df893c838c /drivers/net/wan/sdla.c | |
| parent | i2c: parport: move include file into main source (diff) | |
| parent | i2c: tegra: Properly disable runtime PM on driver's probe error (diff) | |
| download | linux-d02e5ee09bd98b8cec9c2e26b486ed4d6d1b7e2a.tar.xz linux-d02e5ee09bd98b8cec9c2e26b486ed4d6d1b7e2a.zip | |
Merge branch 'i2c/for-current' into i2c/for-5.6
Diffstat (limited to 'drivers/net/wan/sdla.c')
| -rw-r--r-- | drivers/net/wan/sdla.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index e2e679a01b65..77ccf3672ede 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c @@ -708,7 +708,7 @@ static netdev_tx_t sdla_transmit(struct sk_buff *skb, spin_lock_irqsave(&sdla_lock, flags); SDLA_WINDOW(dev, addr); - pbuf = (void *)(((int) dev->mem_start) + (addr & SDLA_ADDR_MASK)); + pbuf = (void *)(dev->mem_start + (addr & SDLA_ADDR_MASK)); __sdla_write(dev, pbuf->buf_addr, skb->data, skb->len); SDLA_WINDOW(dev, addr); pbuf->opp_flag = 1; |