aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-06-09 02:47:32 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-06-18 19:08:39 -0400
commit19f5a0c78573ed920a7f68de4a92603fdefa2ab6 (patch)
tree38be634aa4e5c28f9f103d6c7fb12e6696d7d88e
parent86b0905516460b87542686248690337e1d703544 (diff)
[media] staging: solo6x10: fix | vs &
The test here is never true because '&' was used instead of '|'. It was the same as: if (status & ((1<<16) & (1<<17)) ... Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/media/solo6x10/i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/i2c.c b/drivers/staging/media/solo6x10/i2c.c
index ef95a500b4da..398070a3d293 100644
--- a/drivers/staging/media/solo6x10/i2c.c
+++ b/drivers/staging/media/solo6x10/i2c.c
@@ -175,7 +175,7 @@ int solo_i2c_isr(struct solo_dev *solo_dev)
175 175
176 solo_reg_write(solo_dev, SOLO_IRQ_STAT, SOLO_IRQ_IIC); 176 solo_reg_write(solo_dev, SOLO_IRQ_STAT, SOLO_IRQ_IIC);
177 177
178 if (status & (SOLO_IIC_STATE_TRNS & SOLO_IIC_STATE_SIG_ERR) || 178 if (status & (SOLO_IIC_STATE_TRNS | SOLO_IIC_STATE_SIG_ERR) ||
179 solo_dev->i2c_id < 0) { 179 solo_dev->i2c_id < 0) {
180 solo_i2c_stop(solo_dev); 180 solo_i2c_stop(solo_dev);
181 return -ENXIO; 181 return -ENXIO;