Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index a23fb0338986..d86f8e92e534 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -134,7 +134,7 @@ struct msp3400c {
         int rxsubchans;
 
         int muted;
-        int left, right;        /* volume */
+        int left, right;        /* volume */
         int bass, treble;
 
         /* shadow register set */
@@ -882,6 +882,7 @@ static void watch_stereo(struct i2c_client *client)
                 msp->watch_stereo = 0;
 }
 
+
 static int msp3400c_thread(void *data)
 {
         struct i2c_client *client = data;
@@ -889,6 +890,7 @@ static int msp3400c_thread(void *data)
         struct CARRIER_DETECT *cd;
         int count, max1,max2,val1,val2, val,this;
 
+
         msp3400_info("msp3400 daemon started\n");
         for (;;) {
                 msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
@@ -1162,6 +1164,7 @@ static int msp3410d_thread(void *data)
         int mode,val,i,std;
 
         msp3400_info("msp3410 daemon started\n");
+
         for (;;) {
                 msp3400_dbg_mediumvol("msp3410 thread: sleep\n");
                 msp34xx_sleep(msp,-1);
@@ -1384,6 +1387,7 @@ static int msp34xxg_thread(void *data)
         int val, std, i;
 
         msp3400_info("msp34xxg daemon started\n");
+
         msp->source = 1; /* default */
         for (;;) {
                 msp3400_dbg_mediumvol("msp34xxg thread: sleep\n");
@@ -1559,11 +1563,11 @@ static void msp_wake_thread(struct i2c_client *client);
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "msp3400",
-        .id             = I2C_DRIVERID_MSP3400,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = msp_probe,
-        .detach_client  = msp_detach,
-        .command        = msp_command,
+        .id             = I2C_DRIVERID_MSP3400,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = msp_probe,
+        .detach_client  = msp_detach,
+        .command        = msp_command,
         .driver = {
                 .suspend = msp_suspend,
                 .resume  = msp_resume,
@@ -1574,7 +1578,7 @@ static struct i2c_client client_template =
 {
         .name      = "(unset)",
         .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+        .driver    = &driver,
 };
 
 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)