Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141488
b: refs/heads/master
c: f10fe57
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent abed71c commit 760036e
Show file tree
Hide file tree
Showing 2 changed files with 4 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: c7427409cd071a34c4a13c5c24531b7a10334e31
refs/heads/master: f10fe5742ba6ad6a2219cbe774e1b9d3db0ef23d
8 changes: 3 additions & 5 deletions trunk/drivers/staging/comedi/drivers/s626.c
Original file line number Diff line number Diff line change
Expand Up @@ -2431,8 +2431,7 @@ static uint8_t I2Cread(comedi_device *dev, uint8_t addr)
/* Byte2 = I2C command: write to I2C EEPROM device. */
| I2C_B1(I2C_ATTRSTOP, addr)
/* Byte1 = EEPROM internal target address. */
| I2C_B0(I2C_ATTRNOP, 0))) /* Byte0 = Not sent. */
{
| I2C_B0(I2C_ATTRNOP, 0))) { /* Byte0 = Not sent. */
/* Abort function and declare error if handshake failed. */
DEBUG("I2Cread: error handshake I2Cread a\n");
return 0;
Expand All @@ -2445,9 +2444,8 @@ static uint8_t I2Cread(comedi_device *dev, uint8_t addr)
| I2C_B1(I2C_ATTRSTOP, 0) /* Byte1 receives */
/* uint8_t from */
/* EEPROM. */
| I2C_B0(I2C_ATTRNOP, 0))) /* Byte0 = Not */
/* sent. */
{
| I2C_B0(I2C_ATTRNOP, 0))) { /* Byte0 = Not sent. */

/* Abort function and declare error if handshake failed. */
DEBUG("I2Cread: error handshake I2Cread b\n");
return 0;
Expand Down

0 comments on commit 760036e

Please sign in to comment.