Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 215210
b: refs/heads/master
c: f3a3ed3
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer authored and Marc Kleine-Budde committed Oct 18, 2010
1 parent bd410a4 commit d157df9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 711e4d6eccd72c57938228b8e0c29cb205527032
refs/heads/master: f3a3ed3115d39463dc6672454bfbeaff46811a37
20 changes: 17 additions & 3 deletions trunk/drivers/net/can/mcp251x.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,20 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)
return val;
}

static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg,
uint8_t *v1, uint8_t *v2)
{
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);

priv->spi_tx_buf[0] = INSTRUCTION_READ;
priv->spi_tx_buf[1] = reg;

mcp251x_spi_trans(spi, 4);

*v1 = priv->spi_rx_buf[2];
*v2 = priv->spi_rx_buf[3];
}

static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val)
{
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
Expand Down Expand Up @@ -754,10 +768,11 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)
mutex_lock(&priv->mcp_lock);
while (!priv->force_quit) {
enum can_state new_state;
u8 intf = mcp251x_read_reg(spi, CANINTF);
u8 eflag;
u8 intf, eflag;
int can_id = 0, data1 = 0;

mcp251x_read_2regs(spi, CANINTF, &intf, &eflag);

if (intf & CANINTF_RX0IF) {
mcp251x_hw_rx(spi, 0);
/* Free one buffer ASAP */
Expand All @@ -770,7 +785,6 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)

mcp251x_write_bits(spi, CANINTF, intf, 0x00);

eflag = mcp251x_read_reg(spi, EFLG);
mcp251x_write_reg(spi, EFLG, 0x00);

/* Update can state */
Expand Down

0 comments on commit d157df9

Please sign in to comment.