summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorNickolai Zeldovich <nickolai@csail.mit.edu>2013-01-05 19:13:05 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 22:03:52 +0100
commit7e20f6bfc47992d93b36f4ed068782f8726b75a3 (patch)
tree74f1171bd05a5da48f1fe6d561f9d7d44e01dee4 /drivers/media
parent[media] iguanair: intermittent initialization failure (diff)
downloadlinux-7e20f6bfc47992d93b36f4ed068782f8726b75a3.tar.xz
linux-7e20f6bfc47992d93b36f4ed068782f8726b75a3.zip
[media] drivers/media/usb/dvb-usb/dib0700_core.c: fix left shift
Fix bug introduced in 7757ddda6f4febbc52342d82440dd4f7a7d4f14f, where instead of bit-negating the bitmask, the bit position was bit-negated instead. Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu> Cc: Olivier Grenie <olivier.grenie@dibcom.fr> Cc: Patrick Boettcher <patrick.boettcher@dibcom.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/dvb-usb/dib0700_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index bf2a908d74cf..bd6a43785d5e 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -584,7 +584,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
if (onoff)
st->channel_state |= 1 << (adap->id);
else
- st->channel_state |= 1 << ~(adap->id);
+ st->channel_state &= ~(1 << (adap->id));
} else {
if (onoff)
st->channel_state |= 1 << (adap->fe_adap[0].stream.props.endpoint-2);