Skip to content

Commit

Permalink
[media] staging: solo6x10: fix | vs &
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Jun 18, 2012
1 parent 86b0905 commit 19f5a0c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/staging/media/solo6x10/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 19f5a0c

Please sign in to comment.