diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-06 16:11:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-06 16:11:57 -0700 |
| commit | 28b8383d5d4d9b636c3734c993563bafdc2ab3c3 (patch) | |
| tree | 95fd3fc6e12cdca5cbf999595273bda9ae104922 /drivers/media/dvb/frontends/s5h1409.c | |
| parent | c28cf0fdcd38e912fa72258d78cb213b716247d6 (diff) | |
| parent | a80c5aa6da485da63def31442a19cdd6ff495ce6 (diff) | |
| download | talos-op-linux-28b8383d5d4d9b636c3734c993563bafdc2ab3c3.tar.gz talos-op-linux-28b8383d5d4d9b636c3734c993563bafdc2ab3c3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (7499): v4l/dvb Kconfig: Fix bugzilla #10067
V4L/DVB (7495): s5h1409: fix blown-away bit in function s5h1409_set_gpio
V4L/DVB (7460): bttv: Bt832 - fix possible NULL pointer deref
Diffstat (limited to 'drivers/media/dvb/frontends/s5h1409.c')
| -rw-r--r-- | drivers/media/dvb/frontends/s5h1409.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index 819433485d3b..1a4d8319773c 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c @@ -445,7 +445,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable) s5h1409_readreg(state, 0xe3) | 0x1100); else return s5h1409_writereg(state, 0xe3, - s5h1409_readreg(state, 0xe3) & 0xeeff); + s5h1409_readreg(state, 0xe3) & 0xfeff); } static int s5h1409_sleep(struct dvb_frontend* fe, int enable) |
