summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-06 08:12:07 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-06 08:12:07 -0300
commit18c7475db040fb0ed62df174b6831aea290f2479 (patch)
tree5a79d04339d7d6289fc5acc3921032b999884004 /linux/drivers/media/dvb
parentfbcd7beea764d905edd7aec98388395e0d112a9d (diff)
parentfa78f832b219585b0c8df60fa718e52ae8212bdd (diff)
downloadmediapointer-dvb-s2-18c7475db040fb0ed62df174b6831aea290f2479.tar.gz
mediapointer-dvb-s2-18c7475db040fb0ed62df174b6831aea290f2479.tar.bz2
merge: http://kernellabs.com/hg/~pboettcher/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/cinergyT2-fe.c1
-rw-r--r--linux/drivers/media/dvb/siano/sms-cards.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/linux/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
index 649f25cca..9cd51ac12 100644
--- a/linux/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
+++ b/linux/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
@@ -275,6 +275,7 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,
param.tps = cpu_to_le16(compute_tps(fep));
param.freq = cpu_to_le32(fep->frequency / 1000);
param.bandwidth = 8 - fep->u.ofdm.bandwidth - BANDWIDTH_8_MHZ;
+ param.flags = 0;
err = dvb_usb_generic_rw(state->d,
(char *)&param, sizeof(param),
diff --git a/linux/drivers/media/dvb/siano/sms-cards.c b/linux/drivers/media/dvb/siano/sms-cards.c
index 76bd3cb82..62c1bf604 100644
--- a/linux/drivers/media/dvb/siano/sms-cards.c
+++ b/linux/drivers/media/dvb/siano/sms-cards.c
@@ -116,8 +116,10 @@ static inline void sms_gpio_assign_11xx_default_led_config(
int sms_board_event(struct smscore_device_t *coredev,
enum SMS_BOARD_EVENTS gevent) {
+#if 0
int board_id = smscore_get_board_id(coredev);
struct sms_board *board = sms_get_board(board_id);
+#endif
struct smscore_gpio_config MyGpioConfig;
sms_gpio_assign_11xx_default_led_config(&MyGpioConfig);