- Patch by Olaf Titz: gcc 2.95 compile fixes

6 files changed, 19 insertions, 8 deletions

diff --git a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 28eab47ba..9fc2d1764 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -60,8 +60,8 @@ static int flexcop_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
 	/* u16 wz_half_period_for_45_mhz[] = { 0x01ff, 0x0154, 0x00ff, 0x00cc }; */
 	struct flexcop_device *fc = fe->dvb->priv;
 	flexcop_ibi_value v;
-	v.raw = 0;
 	u16 ax;
+	v.raw = 0;
 
 	deb_tuner("tone = %u\n",tone);
 
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;
diff --git a/linux/drivers/media/dvb/frontends/dvb-pll.h b/linux/drivers/media/dvb/frontends/dvb-pll.h
index 27bf61604..3c8db5a7a 100644
--- a/linux/drivers/media/dvb/frontends/dvb-pll.h
+++ b/linux/drivers/media/dvb/frontends/dvb-pll.h
@@ -1,7 +1,13 @@
 /*
- * $Id: dvb-pll.h,v 1.1 2005/02/16 19:50:06 js Exp $
+ * $Id: dvb-pll.h,v 1.2 2005/03/19 17:24:34 kenneth Exp $
  */
 
+#if __GNUC__ < 3
+#define MAX_PLL_ENTRIES 10
+#else
+#define MAX_PLL_ENTRIES
+#endif
+
 struct dvb_pll_desc {
 	char *name;
 	u32  min;
@@ -14,7 +20,7 @@ struct dvb_pll_desc {
 		u32 stepsize;
 		u8  cb1;
 		u8  cb2;
-	} entries[];
+	} entries[MAX_PLL_ENTRIES];
 };
 
 extern struct dvb_pll_desc dvb_pll_thomson_dtt7579;
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c
index e5fa5b08a..6d2256f1e 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c
@@ -161,11 +161,11 @@ static int av7110_ir_write_proc(struct file *file, const char __user *buffer,
 
 int __init av7110_ir_init(void)
 {
+	static struct proc_dir_entry *e;
+
 	if (ir_initialized)
 		return 0;
 
-	static struct proc_dir_entry *e;
-
 	init_timer(&keyup_timer);
 	keyup_timer.data = 0;
 
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index f3754ed89..2cc3e9993 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
@@ -188,6 +188,7 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
 {
 	struct budget_av *budget_av = (struct budget_av *) ca->data;
 	struct saa7146_dev *saa = budget_av->budget.dev;
+	int max = 20;
 
 	if (slot != 0)
 		return -EINVAL;
@@ -199,7 +200,6 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
 	msleep(100);
 	saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
 
-	int max = 20;
 	while (--max > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
 		msleep(100);