Merge branch 'smsc47b397-new-id' into release

[linux-2.6-omap-h63xx.git] / drivers / media / video / et61x251 / et61x251_tas5130d1b.c

diff --git a/drivers/media/video/et61x251/et61x251_tas5130d1b.c b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
index 3998d76a307a3a6cc9bafae9081eebd8e1d1b9d9..04b7fbb310a82d6d7737c57846d325f651f4f367 100644 (file)
--- a/drivers/media/video/et61x251/et61x251_tas5130d1b.c
+++ b/drivers/media/video/et61x251/et61x251_tas5130d1b.c
@@ -2,7 +2,7 @@
  * Plug-in for TAS5130D1B image sensor connected to the ET61X[12]51        *
  * PC Camera Controllers                                                   *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * 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    *
@@ -46,20 +46,20 @@ static int tas5130d1b_init(struct et61x251_device* cam)
 
 
 static int tas5130d1b_set_ctrl(struct et61x251_device* cam,
-                               const struct v4l2_control* ctrl)
+                              const struct v4l2_control* ctrl)
 {
        int err = 0;
 
        switch (ctrl->id) {
        case V4L2_CID_GAIN:
                err += et61x251_i2c_raw_write(cam, 2, 0x20,
-                                             0xf6-ctrl->value, 0, 0, 0,
-                                             0, 0, 0, 0);
+                                             0xf6-ctrl->value, 0, 0, 0,
+                                             0, 0, 0, 0);
                break;
        case V4L2_CID_EXPOSURE:
                err += et61x251_i2c_raw_write(cam, 2, 0x40,
-                                             0x47-ctrl->value, 0, 0, 0,
-                                             0, 0, 0, 0);
+                                             0x47-ctrl->value, 0, 0, 0,
+                                             0, 0, 0, 0);
                break;
        default:
                return -EINVAL;
@@ -69,7 +69,7 @@ static int tas5130d1b_set_ctrl(struct et61x251_device* cam,
 }
 
 
-static struct et61x251_sensor tas5130d1b = {
+static const struct et61x251_sensor tas5130d1b = {
        .name = "TAS5130D1B",
        .interface = ET61X251_I2C_3WIRES,
        .rsta = ET61X251_I2C_RSTA_STOP,