diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:32:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:32:53 -0300 |
| commit | bcb7869683912e8dca99bace426b7e080851354c (patch) | |
| tree | 4d38b5271128b9961a2247e38aa3c24bffbd7e58 /linux/drivers/media/dvb/frontends | |
| parent | a38e35700be7bf1a1333cc699af97799c833be4d (diff) | |
| parent | 1835a6cbe8df59c3df94c9535179e999a2da88ca (diff) | |
| download | mediapointer-dvb-s2-bcb7869683912e8dca99bace426b7e080851354c.tar.gz mediapointer-dvb-s2-bcb7869683912e8dca99bace426b7e080851354c.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/cx24123.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0299.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24123.c b/linux/drivers/media/dvb/frontends/cx24123.c index 173ce050b..a73a3fd5c 100644 --- a/linux/drivers/media/dvb/frontends/cx24123.c +++ b/linux/drivers/media/dvb/frontends/cx24123.c @@ -928,7 +928,7 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone) static int cx24123_tune(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, unsigned int mode_flags, - int *delay, + unsigned int *delay, fe_status_t *status) { int retval = 0; diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 18768d2f6..6c607302c 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -249,7 +249,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state) dprintk ("%s\n", __FUNCTION__); stv0299_readregs (state, 0x1f, sfr, 3); - stv0299_readregs (state, 0x1a, &rtf, 1); + stv0299_readregs (state, 0x1a, (u8 *)&rtf, 1); srate = (sfr[0] << 8) | sfr[1]; srate *= Mclk; |