Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74831
b: refs/heads/master
c: fce3ff0
h: refs/heads/master
i:
  74829: 8ac7d24
  74827: c5bb892
  74823: 8df4e82
  74815: 2eb0e66
v: v3
  • Loading branch information
Joe Perches authored and Jean Delvare committed Dec 12, 2007
1 parent 5467543 commit da5fef8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 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: 50862d9490e8fbb317040b3faeee7caf56c00025
refs/heads/master: fce3ff03311e0397e2867cce67d4ccf31707a1ea
4 changes: 2 additions & 2 deletions trunk/drivers/i2c/busses/i2c-davinci.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
DAVINCI_I2C_STR_REG,
w);
} else
dev_err(dev->dev, "RDR IRQ while no"
dev_err(dev->dev, "RDR IRQ while no "
"data requested\n");
break;

Expand All @@ -423,7 +423,7 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
DAVINCI_I2C_IMR_REG,
w);
} else
dev_err(dev->dev, "TDR IRQ while no data to"
dev_err(dev->dev, "TDR IRQ while no data to "
"send\n");
break;

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
while (!(omap_i2c_read_reg(dev, OMAP_I2C_SYSS_REG) &
OMAP_I2C_SYSS_RDONE)) {
if (time_after(jiffies, timeout)) {
dev_warn(dev->dev, "timeout waiting"
dev_warn(dev->dev, "timeout waiting "
"for controller reset\n");
return -ETIMEDOUT;
}
Expand Down Expand Up @@ -483,7 +483,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
dev->buf_len--;
}
} else
dev_err(dev->dev, "RRDY IRQ while no data"
dev_err(dev->dev, "RRDY IRQ while no data "
"requested\n");
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RRDY);
continue;
Expand All @@ -498,7 +498,7 @@ omap_i2c_isr(int this_irq, void *dev_id)
dev->buf_len--;
}
} else
dev_err(dev->dev, "XRDY IRQ while no"
dev_err(dev->dev, "XRDY IRQ while no "
"data to send\n");
omap_i2c_write_reg(dev, OMAP_I2C_DATA_REG, w);
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
Expand Down

0 comments on commit da5fef8

Please sign in to comment.