diff options
Diffstat (limited to 'drivers/net/can/sja1000/sja1000.c')
| -rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index daf4013a8fc..e4df307eaa9 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -92,7 +92,7 @@ static void sja1000_write_cmdreg(struct sja1000_priv *priv, u8 val)  	 */  	spin_lock_irqsave(&priv->cmdreg_lock, flags);  	priv->write_reg(priv, REG_CMR, val); -	priv->read_reg(priv, REG_SR); +	priv->read_reg(priv, SJA1000_REG_SR);  	spin_unlock_irqrestore(&priv->cmdreg_lock, flags);  } @@ -502,7 +502,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)  	while ((isrc = priv->read_reg(priv, REG_IR)) && (n < SJA1000_MAX_IRQ)) {  		n++; -		status = priv->read_reg(priv, REG_SR); +		status = priv->read_reg(priv, SJA1000_REG_SR);  		/* check for absent controller due to hw unplug */  		if (status == 0xFF && sja1000_is_absent(priv))  			return IRQ_NONE; @@ -530,7 +530,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)  			/* receive interrupt */  			while (status & SR_RBS) {  				sja1000_rx(dev); -				status = priv->read_reg(priv, REG_SR); +				status = priv->read_reg(priv, SJA1000_REG_SR);  				/* check for absent controller */  				if (status == 0xFF && sja1000_is_absent(priv))  					return IRQ_NONE;  |