diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/saa7114.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c index fd0a4b4ef014..1c29d05307a5 100644 --- a/drivers/media/video/saa7114.c +++ b/drivers/media/video/saa7114.c | |||
| @@ -139,9 +139,6 @@ saa7114_write (struct i2c_client *client, | |||
| 139 | u8 reg, | 139 | u8 reg, |
| 140 | u8 value) | 140 | u8 value) |
| 141 | { | 141 | { |
| 142 | /*struct saa7114 *decoder = i2c_get_clientdata(client);*/ | ||
| 143 | |||
| 144 | /*decoder->reg[reg] = value;*/ | ||
| 145 | return i2c_smbus_write_byte_data(client, reg, value); | 142 | return i2c_smbus_write_byte_data(client, reg, value); |
| 146 | } | 143 | } |
| 147 | 144 | ||
| @@ -157,7 +154,6 @@ saa7114_write_block (struct i2c_client *client, | |||
| 157 | * the adapter understands raw I2C */ | 154 | * the adapter understands raw I2C */ |
| 158 | if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { | 155 | if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { |
| 159 | /* do raw I2C, not smbus compatible */ | 156 | /* do raw I2C, not smbus compatible */ |
| 160 | /*struct saa7114 *decoder = i2c_get_clientdata(client);*/ | ||
| 161 | struct i2c_msg msg; | 157 | struct i2c_msg msg; |
| 162 | u8 block_data[32]; | 158 | u8 block_data[32]; |
| 163 | 159 | ||
| @@ -168,8 +164,8 @@ saa7114_write_block (struct i2c_client *client, | |||
| 168 | msg.len = 0; | 164 | msg.len = 0; |
| 169 | block_data[msg.len++] = reg = data[0]; | 165 | block_data[msg.len++] = reg = data[0]; |
| 170 | do { | 166 | do { |
| 171 | block_data[msg.len++] = | 167 | block_data[msg.len++] = data[1]; |
| 172 | /*decoder->reg[reg++] =*/ data[1]; | 168 | reg++; |
| 173 | len -= 2; | 169 | len -= 2; |
| 174 | data += 2; | 170 | data += 2; |
| 175 | } while (len >= 2 && data[0] == reg && | 171 | } while (len >= 2 && data[0] == reg && |
