Commit 19f5a0c7 authored Jun 09, 2012 by Dan Carpenter Committed by Mauro Carvalho Chehab Jun 18, 2012

[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>

parent 86b09055

drivers/staging/media/solo6x10/i2c.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;