diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 08:29:39 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 08:31:55 -0200 |
| commit | f85ed0ceeba78b6b15a857ce48888fdb52de28d0 (patch) | |
| tree | 6cf49bd4d9f0cf1786bc0e5a16cd002efd009d5c /drivers/media/usb | |
| parent | 6a05d66b8ff1e3a3470186d25cd825dff774bb82 (diff) | |
| download | linux-3.10-f85ed0ceeba78b6b15a857ce48888fdb52de28d0.tar.gz linux-3.10-f85ed0ceeba78b6b15a857ce48888fdb52de28d0.tar.bz2 linux-3.10-f85ed0ceeba78b6b15a857ce48888fdb52de28d0.zip | |
Revert "[media] drivers/media/usb/dvb-usb/dib0700_core.c: fix left shift"
On Wed, 6 Feb 2013 09:04:39 +0000
Olivier GRENIE <olivier.grenie@parrot.com> wrote:
> I do not agree with the patch. Let's take an example: adap->id = 0. Then:
> * 1 << ~(adap->id) = 1 << ~(0) = 0
> * ~(1 << adap->id) = ~(1 << 0) = 0xFE
>
> The correct change should be: st->channel_state |= 1 << (1 - adap->id); Indeed, the original source code was not correct.
Requested-by: Olivier GRENIE <olivier.grenie@parrot.com>
Cc: Patrick Boettcher <patrick.boettcher@dibcom.fr>
Cc: Nickolai Zeldovich <nickolai@csail.mit.edu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/dvb-usb/dib0700_core.c | 2 |
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 bd6a43785d5..bf2a908d74c 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); |