diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-06-09 03:47:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-18 20:08:39 -0300 |
| commit | 19f5a0c78573ed920a7f68de4a92603fdefa2ab6 (patch) | |
| tree | 38be634aa4e5c28f9f103d6c7fb12e6696d7d88e /drivers/staging/media | |
| parent | 86b0905516460b87542686248690337e1d703544 (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>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/solo6x10/i2c.c | 2 |
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) solo_reg_write(solo_dev, SOLO_IRQ_STAT, SOLO_IRQ_IIC); - if (status & (SOLO_IIC_STATE_TRNS & SOLO_IIC_STATE_SIG_ERR) || + if (status & (SOLO_IIC_STATE_TRNS | SOLO_IIC_STATE_SIG_ERR) || solo_dev->i2c_id < 0) { solo_i2c_stop(solo_dev); return -ENXIO; |