diff --git a/[refs] b/[refs] index d8f0218ac90f..cc82c13cd026 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7427409cd071a34c4a13c5c24531b7a10334e31 +refs/heads/master: f10fe5742ba6ad6a2219cbe774e1b9d3db0ef23d diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c index 26cc41073b0b..ff6118e8ad4a 100644 --- a/trunk/drivers/staging/comedi/drivers/s626.c +++ b/trunk/drivers/staging/comedi/drivers/s626.c @@ -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; @@ -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;