X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Ftda9875.c;h=ef98c49822507f63d5ffbf710890541cdc8c2e6c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=103ccb91929260353df41e36a2e0be86ae882dc2;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 103ccb919..ef98c4982 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -30,22 +30,24 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
 
-
-#include <media/i2c-addr.h>
+#include "bttv.h"
+#include <media/audiochip.h>
 
 static int debug; /* insmod parameter */
 module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_LICENSE("GPL");
 
+
 /* Addresses to scan */
 static unsigned short normal_i2c[] =  {
-    I2C_ADDR_TDA9875 >> 1,
+    I2C_TDA9875 >> 1,
     I2C_CLIENT_END
 };
 I2C_CLIENT_INSMOD;
 
 /* This is a superset of the TDA9875 */
 struct tda9875 {
+	int mode;
 	int rvol, lvol;
 	int bass, treble;
 	struct i2c_client c;
@@ -195,6 +197,7 @@ static void do_tda9875_init(struct i2c_client *client)
 
 	tda9875_write(client, TDA9875_MUT, 0xcc );   /* General mute  */
 
+	t->mode=AUDIO_UNMUTE;
 	t->lvol=t->rvol =0;  	/* 0dB */
 	t->bass=0; 			/* 0dB */
 	t->treble=0;  		/* 0dB */