summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dibusb
diff options
context:
space:
mode:
authorKenneth Aafloy <devnull@localhost>2005-03-19 17:24:34 +0000
committerKenneth Aafloy <devnull@localhost>2005-03-19 17:24:34 +0000
commit8b6daa9c4c181b1de5c52f71be35008e3a5fcfd6 (patch)
treeb433d8f2ccd96be70aa7921947d7f49c5675b0ea /linux/drivers/media/dvb/dibusb
parentf632cdc89c36708cf5d35b3576fda3e15c742911 (diff)
downloadmediapointer-dvb-s2-8b6daa9c4c181b1de5c52f71be35008e3a5fcfd6.tar.gz
mediapointer-dvb-s2-8b6daa9c4c181b1de5c52f71be35008e3a5fcfd6.tar.bz2
- Patch by Olaf Titz: gcc 2.95 compile fixes
Diffstat (limited to 'linux/drivers/media/dvb/dibusb')
-rw-r--r--linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c2
-rw-r--r--linux/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
index 709913a9e..67fe74515 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
@@ -424,8 +424,8 @@ static struct dibusb_usb_device * dibusb_device_class_quirk(struct usb_device *u
static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,int *cold)
{
int i,j;
- *cold = -1;
struct dibusb_usb_device *dev = NULL;
+ *cold = -1;
for (i = 0; i < sizeof(dibusb_devices)/sizeof(struct dibusb_usb_device); i++) {
for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].cold_ids[j] != NULL; j++) {
diff --git a/linux/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c b/linux/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c
index 61f4d16cb..a1d3990eb 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-fe-dtt200u.c
@@ -169,8 +169,13 @@ static void dtt200u_fe_release(struct dvb_frontend* fe)
static int dtt200u_pid_control(struct dvb_frontend *fe,int index, int pid,int onoff)
{
struct dtt200u_fe_state *state = (struct dtt200u_fe_state*) fe->demodulator_priv;
+ u8 b_pid[4];
pid = onoff ? pid : 0;
- u8 b_pid[4] = { 0x04, index, pid & 0xff, (pid >> 8) & 0xff };
+
+ b_pid[0] = 0x04;
+ b_pid[1] = index;
+ b_pid[2] = pid & 0xff;
+ b_pid[3] = (pid >> 8) & 0xff;
dibusb_write_usb(state->dib,b_pid,4);
return 0;