diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-02-04 08:03:11 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 12:39:32 -0500 |
commit | 9713883b0fa3a8afbff0cd2282d689719d7c39c2 (patch) | |
tree | d0adcb9b5081e68e177f6f6a9dc180a340a47c37 | |
parent | f704eab5b6beff878fc68dca800a4979ec97a15c (diff) |
[media] cx231xx: drop condition with no effect
The if and the else code are identical - so the condition has no effect
on the effective code.
This patch removes the condition and the duplicated code.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-core.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c index 4a3f28c4e8d3..e42bde081cd7 100644 --- a/drivers/media/usb/cx231xx/cx231xx-core.c +++ b/drivers/media/usb/cx231xx/cx231xx-core.c | |||
@@ -176,16 +176,9 @@ int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus, | |||
176 | saddr_len = req_data->saddr_len; | 176 | saddr_len = req_data->saddr_len; |
177 | 177 | ||
178 | /* Set wValue */ | 178 | /* Set wValue */ |
179 | if (saddr_len == 1) /* need check saddr_len == 0 */ | 179 | ven_req.wValue = (req_data->dev_addr << 9 | _i2c_period << 4 | |
180 | ven_req.wValue = | 180 | saddr_len << 2 | _i2c_nostop << 1 | I2C_SYNC | |
181 | req_data-> | 181 | _i2c_reserve << 6); |
182 | dev_addr << 9 | _i2c_period << 4 | saddr_len << 2 | | ||
183 | _i2c_nostop << 1 | I2C_SYNC | _i2c_reserve << 6; | ||
184 | else | ||
185 | ven_req.wValue = | ||
186 | req_data-> | ||
187 | dev_addr << 9 | _i2c_period << 4 | saddr_len << 2 | | ||
188 | _i2c_nostop << 1 | I2C_SYNC | _i2c_reserve << 6; | ||
189 | 182 | ||
190 | /* set channel number */ | 183 | /* set channel number */ |
191 | if (req_data->direction & I2C_M_RD) { | 184 | if (req_data->direction & I2C_M_RD) { |