diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-13 07:34:32 +0300 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-13 07:34:32 +0300 |
commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/media/dvb/dvb-usb/vp7045-fe.c | |
parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
download | linux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.xz |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp7045-fe.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045-fe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c index 2746edfeccba..83f1de1e7e57 100644 --- a/drivers/media/dvb/dvb-usb/vp7045-fe.c +++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c @@ -58,7 +58,7 @@ static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber) struct vp7045_fe_state *state = fe->demodulator_priv; *ber = (vp7045_read_reg(state->d, 0x0D) << 16) | (vp7045_read_reg(state->d, 0x0E) << 8) | - vp7045_read_reg(state->d, 0x0F); + vp7045_read_reg(state->d, 0x0F); return 0; } |