Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / media / video / tvaudio.c

diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index a75560540e798457e32f537f32a46692f0aa930f..6f9945b04e1f2bcd676f0ed8dc910994b29ed300 100644 (file)
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -38,7 +38,7 @@
 /* ---------------------------------------------------------------------- */
 /* insmod args                                                            */
 
-static int debug = 0;  /* insmod parameter */
+static int debug;      /* insmod parameter */
 module_param(debug, int, 0644);
 
 MODULE_DESCRIPTION("device driver for various i2c TV sound decoder / audiomux chips");
@@ -1235,11 +1235,11 @@ static int tda9850  = 1;
 static int tda9855  = 1;
 static int tda9873  = 1;
 static int tda9874a = 1;
-static int tea6300  = 0;  /* address clash with msp34xx */
-static int tea6320  = 0;  /* address clash with msp34xx */
+static int tea6300;    /* default 0 - address clash with msp34xx */
+static int tea6320;    /* default 0 - address clash with msp34xx */
 static int tea6420  = 1;
 static int pic16c54 = 1;
-static int ta8874z  = 0;  /* address clash with tda9840 */
+static int ta8874z;    /* default 0 - address clash with tda9840 */
 
 module_param(tda8425, int, 0444);
 module_param(tda9840, int, 0444);
@@ -1461,7 +1461,7 @@ static struct CHIPDESC chiplist[] = {
 /* ---------------------------------------------------------------------- */
 /* i2c registration                                                       */
 
-static int chip_probe(struct i2c_client *client)
+static int chip_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        struct CHIPSTATE *chip;
        struct CHIPDESC  *desc;
@@ -1571,14 +1571,14 @@ static int tvaudio_get_ctrl(struct CHIPSTATE *chip,
                ctrl->value=chip->muted;
                return 0;
        case V4L2_CID_AUDIO_VOLUME:
-               if (!desc->flags & CHIP_HAS_VOLUME)
+               if (!(desc->flags & CHIP_HAS_VOLUME))
                        break;
                ctrl->value = max(chip->left,chip->right);
                return 0;
        case V4L2_CID_AUDIO_BALANCE:
        {
                int volume;
-               if (!desc->flags & CHIP_HAS_VOLUME)
+               if (!(desc->flags & CHIP_HAS_VOLUME))
                        break;
                volume = max(chip->left,chip->right);
                if (volume)
@@ -1621,7 +1621,7 @@ static int tvaudio_set_ctrl(struct CHIPSTATE *chip,
        {
                int volume,balance;
 
-               if (!desc->flags & CHIP_HAS_VOLUME)
+               if (!(desc->flags & CHIP_HAS_VOLUME))
                        break;
 
                volume = max(chip->left,chip->right);
@@ -1642,7 +1642,7 @@ static int tvaudio_set_ctrl(struct CHIPSTATE *chip,
        case V4L2_CID_AUDIO_BALANCE:
        {
                int volume, balance;
-               if (!desc->flags & CHIP_HAS_VOLUME)
+               if (!(desc->flags & CHIP_HAS_VOLUME))
                        break;
 
                volume = max(chip->left,chip->right);
@@ -1702,7 +1702,7 @@ static int chip_command(struct i2c_client *client,
                                break;
                        case V4L2_CID_AUDIO_VOLUME:
                        case V4L2_CID_AUDIO_BALANCE:
-                               if (!desc->flags & CHIP_HAS_VOLUME)
+                               if (!(desc->flags & CHIP_HAS_VOLUME))
                                        return -EINVAL;
                                break;
                        case V4L2_CID_AUDIO_BASS: