UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] exynos4-is: Don't overwrite subdevdata in the fimc-is sensor driver 

It's an I2C client driver and it must not overwrite the struct v4l2_subdev
dev_priv field, which is used by the v4l2 core to store a pointer to
struct i2c_client.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sylwester Nawrocki 2013-04-18 09:00:45 -03:00 committed by Mauro Carvalho Chehab
parent b2afa23669
commit 1bc515ac6e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/exynos4-is/fimc-is-sensor.c
View File

@ -40,11 +40,6 @@ static const struct v4l2_mbus_framefmt fimc_is_sensor_formats[] = {
}
};
static struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev *sd)
{
return container_of(sd, struct fimc_is_sensor, subdev);
}
static const struct v4l2_mbus_framefmt *find_sensor_format(
struct v4l2_mbus_framefmt *mf)
{
@ -147,7 +142,7 @@ static const struct v4l2_subdev_internal_ops fimc_is_sensor_sd_internal_ops = {
static int fimc_is_sensor_s_power(struct v4l2_subdev *sd, int on)
{
struct fimc_is_sensor *sensor = v4l2_get_subdevdata(sd);
struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd);
int gpio = sensor->gpio_reset;
int ret;
@ -252,7 +247,6 @@ static int fimc_is_sensor_probe(struct i2c_client *client,
if (ret < 0)
return ret;
v4l2_set_subdevdata(sd, sensor);
pm_runtime_no_callbacks(dev);
pm_runtime_enable(dev);

6
drivers/media/platform/exynos4-is/fimc-is-sensor.h
View File

@ -77,6 +77,12 @@ struct fimc_is_sensor {
struct v4l2_mbus_framefmt format;
};
static inline
struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev *sd)
{
return container_of(sd, struct fimc_is_sensor, subdev);
}
int fimc_is_register_sensor_driver(void);
void fimc_is_unregister_sensor_driver(void);

2
drivers/media/platform/exynos4-is/fimc-is.c
View File

@ -220,7 +220,7 @@ static int fimc_is_register_subdevs(struct fimc_is *is)
if (WARN_ON(is->sensor))
continue;
is->sensor = v4l2_get_subdevdata(sd);
is->sensor = sd_to_fimc_is_sensor(sd);
if (fimc_is_parse_sensor_config(is->sensor, child)) {
dev_warn(&is->pdev->dev, "DT parse error: %s\n",