- misc.

3 files changed, 10 insertions, 10 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index d356d880f..1c98b741a 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -120,7 +120,7 @@ static void set_audio_standard_BTSC(struct cx8800_dev *dev, unsigned int sap)
 		{ AUD_PHASE_FIX_CTL, 0x0020 },
 	};
 
-	dprintk("%s\n",__FUNCTION__);
+	dprintk("%s (status: unknown)\n",__FUNCTION__);
 	set_audio_start(dev, 0x0001,
 			EN_BTSC_AUTO_STEREO);
         set_audio_registers(dev, btsc);
@@ -148,7 +148,7 @@ static void set_audio_standard_NICAM(struct cx8800_dev *dev)
                 { /* end of list */ },
         };
 
-	dprintk("%s\n",__FUNCTION__);
+	dprintk("%s (status: unknown)\n",__FUNCTION__);
         set_audio_start(dev, 0x0010,
 			EN_DMTRX_LR | EN_NICAM_FORCE_STEREO);
         set_audio_registers(dev, nicam);
@@ -272,7 +272,7 @@ static void set_audio_standard_NICAM_L(struct cx8800_dev *dev)
 		{ /* end of list */ },
 	};
 
-	dprintk("%s\n",__FUNCTION__);
+	dprintk("%s (status: unknown)\n",__FUNCTION__);
         set_audio_start(dev, 0x0004,
 			0 /* FIXME */);
 	set_audio_registers(dev, nicam_l);
@@ -474,7 +474,7 @@ static void set_audio_standard_A2(struct cx8800_dev *dev)
 	};
 
 
-	dprintk("%s\n",__FUNCTION__);
+	dprintk("%s (status: WorksForMe[tm])\n",__FUNCTION__);
 
 	if (0) {
 		/* old code */
@@ -504,7 +504,7 @@ static void set_audio_standard_EIAJ(struct cx8800_dev *dev)
 
 		{ /* end of list */ },
 	};
-	dprintk("%s\n",__FUNCTION__);
+	dprintk("%s (status: unknown)\n",__FUNCTION__);
 
 	set_audio_start(dev, 0x0002, EN_EIAJ_AUTO_STEREO);
 	set_audio_registers(dev, eiaj);
@@ -550,7 +550,7 @@ static void set_audio_standard_FM(struct cx8800_dev *dev)
 	}
 #endif
 
-	dprintk("%s\n",__FUNCTION__);
+	dprintk("%s (status: unknown)\n",__FUNCTION__);
 	set_audio_start(dev, 0x0020, EN_FMRADIO_AUTO_STEREO);
 
 	// AB: 10/2/01: this register is not being reset appropriately on occasion.
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 109bdeb75..838affd8c 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -2455,9 +2455,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 	/* initial device configuration */
 	OOPS("init device");
 	down(&dev->lock);
+	init_controls(dev);
 	set_tvnorm(dev,tvnorms);
 	video_mux(dev,0);
-	init_controls(dev);
 	up(&dev->lock);
 	return 0;
 
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 5fadf124c..766c8eb04 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,7 +1,7 @@
 /*
- * v4l2 device driver for philips saa7134 based TV cards
+ * v4l2 device driver for cx2388x based TV cards
  *
- * (c) 2001,02 Gerd Knorr <kraxel@bytesex.org>
+ * (c) 2003,04 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs]
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -367,7 +367,7 @@ extern const unsigned int cx88_bcount;
 extern struct cx88_subid cx88_subids[];
 extern const unsigned int cx88_idcount;
 
-extern void cx88_card_setup(struct cx8800_dev *dev);
+extern void __devinit cx88_card_setup(struct cx8800_dev *dev);
 
 /* ----------------------------------------------------------- */
 /* cx88-tvaudio.c                                              */