Changeset 5688

Show
Ignore:
Timestamp:
03/18/09 11:17:06 (5 years ago)
Author:
khali
Message:

Fix misplaced parentheses. Patch from Roel Kluin, backported from
Linux 2.6.

Location:
i2c/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • i2c/trunk/CHANGES

    r5570 r5688  
    1111  Makefile: Fallback to simple depmod if System.map can't be found 
    1212  doc/writing-clients: Cleanups (2.6 backport) 
    13   i2c.h: Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines 
     13  i2c.h: Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines (2.6 backport) 
    1414  i2c-core: Drop Linux 2.4 incompatibility mode 
     15            Fix misplaced parentheses (2.6 backport) 
    1516 
    16172.10.5 (20071024) 
  • i2c/trunk/kernel/i2c-core.c

    r5571 r5688  
    11761176                msg[0].len = 0; 
    11771177                /* Special case: The read/write field is used as data */ 
    1178                 msg[0].flags = flags | (read_write==I2C_SMBUS_READ)?I2C_M_RD:0; 
     1178                msg[0].flags = flags | (read_write == I2C_SMBUS_READ ? 
     1179                                        I2C_M_RD : 0); 
    11791180                num = 1; 
    11801181                break;