Pandora Sourcecodes - openembedded.git/blob

   1 From 5c343b5261a3a7382cb9aa414be9f1b57acb3056 Mon Sep 17 00:00:00 2001
   2 From: Sergio Aguirre <saaguirre@ti.com>
   3 Date: Fri, 25 Jun 2010 13:43:54 -0500
   4 Subject: [PATCH 27/28] mt9t111: Fix detect function retval and cleanup prints
   5
   6 Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
   7 ---
   8  drivers/media/video/mt9t111.c |    8 +++-----
   9  1 files changed, 3 insertions(+), 5 deletions(-)
  10
  11 diff --git a/drivers/media/video/mt9t111.c b/drivers/media/video/mt9t111.c
  12 index 6a7b2c0..08122ff 100644
  13 --- a/drivers/media/video/mt9t111.c
  14 +++ b/drivers/media/video/mt9t111.c
  15 @@ -221,7 +221,6 @@ mt9t111_detect(struct i2c_client *client)
  16         /* chip ID is at address 0 */
  17         if (mt9t111_read_reg(client, MT9T111_CHIP_ID, &val) < 0)
  18                 return -ENODEV;
  19 -       dev_info(&client->dev, "model id detected 0x%x\n", val);
  20
  21         if (val != MT9T111_CHIP_ID_VALUE) {
  22                 dev_warn(&client->dev, "model id mismatch received 0x%x"
  23 @@ -231,7 +230,7 @@ mt9t111_detect(struct i2c_client *client)
  24                 return -ENODEV;
  25         }
  26
  27 -       return 0;
  28 +       return (int)val;
  29
  30  }
  31
  32 @@ -390,11 +389,10 @@ static int ioctl_s_power(struct v4l2_int_device *s, enum v4l2_power on)
  33                         sensor->state = SENSOR_NOT_DETECTED;
  34                         return rval;
  35                 }
  36 -               mt9t111_loaddefault(c);
  37 +               dev_info(&c->dev, "chip version 0x%02x detected\n", rval);
  38                 sensor->state = SENSOR_DETECTED;
  39                 sensor->ver = rval;
  40 -               pr_info("mt9t111" " chip version 0x%02x detected\n",
  41 -                                                               sensor->ver);
  42 +               mt9t111_loaddefault(c);
  43         }
  44         return 0;
  45  }
  46 --
  47 1.6.6.1
  48