diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 20:04:56 -0200 |
| commit | 7af33dc182a51e3feda1246207c939d8459dbd61 (patch) | |
| tree | 81416520e5321725fa97909e5652ed7c87598893 /linux/drivers/media/dvb/frontends/stb0899_drv.c | |
| parent | 1272389ee0a46d702d0dc471d791b9fae7668aed (diff) | |
| parent | b4efb4ebbf8e3e7d3d0230bf4a811f7dafeef9a0 (diff) | |
| download | mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.gz mediapointer-dvb-s2-7af33dc182a51e3feda1246207c939d8459dbd61.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stb0899_drv.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stb0899_drv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/frontends/stb0899_drv.c b/linux/drivers/media/dvb/frontends/stb0899_drv.c index 02edf1760..63c547f31 100644 --- a/linux/drivers/media/dvb/frontends/stb0899_drv.c +++ b/linux/drivers/media/dvb/frontends/stb0899_drv.c @@ -272,9 +272,9 @@ int stb0899_read_reg(struct stb0899_state *state, unsigned int reg) } u32 _stb0899_read_s2reg(struct stb0899_state *state, - u32 stb0899_i2cdev, - u32 stb0899_base_addr, - u16 stb0899_reg_offset) + u32 stb0899_i2cdev, + u32 stb0899_base_addr, + u16 stb0899_reg_offset) { int status; u32 data; @@ -372,7 +372,7 @@ err: } int stb0899_write_s2reg(struct stb0899_state *state, - u32 stb0899_i2cdev, + u32 stb0899_i2cdev, u32 stb0899_base_addr, u16 stb0899_reg_offset, u32 stb0899_data) @@ -1932,7 +1932,6 @@ static struct dvb_frontend_ops stb0899_ops = { .read_status = stb0899_read_status, .read_snr = stb0899_read_snr, .read_signal_strength = stb0899_read_signal_strength, - .read_status = stb0899_read_status, .read_ber = stb0899_read_ber, .set_voltage = stb0899_set_voltage, |