diff options
author | David Cohen <dacohen@gmail.com> | 2010-12-08 07:13:59 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-30 19:29:21 -0500 |
commit | 63c9718c1a4595d51f5b70ed4aed6cee5aea875b (patch) | |
tree | b60410695015c77940e9065dccbe831d88e022ed /drivers/media | |
parent | f7b74f76a3a5bcad4d2e8db76834253a63977545 (diff) |
[media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
OmniVision OV9640 driver wasn't requesting properly its private data
on I2C remove and video_probe functions. It was retrieving the V4L2
subdev struct address instead of priv struct's one. This patch fixes
such problem.
Signed-off-by: David Cohen <dacohen@gmail.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/ov9640.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c index c6d8e8a88d2d..53d88a2ab920 100644 --- a/drivers/media/video/ov9640.c +++ b/drivers/media/video/ov9640.c | |||
@@ -651,7 +651,8 @@ static int ov9640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) | |||
651 | static int ov9640_video_probe(struct soc_camera_device *icd, | 651 | static int ov9640_video_probe(struct soc_camera_device *icd, |
652 | struct i2c_client *client) | 652 | struct i2c_client *client) |
653 | { | 653 | { |
654 | struct ov9640_priv *priv = i2c_get_clientdata(client); | 654 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
655 | struct ov9640_priv *priv = to_ov9640_sensor(sd); | ||
655 | u8 pid, ver, midh, midl; | 656 | u8 pid, ver, midh, midl; |
656 | const char *devname; | 657 | const char *devname; |
657 | int ret = 0; | 658 | int ret = 0; |
@@ -788,7 +789,8 @@ static int ov9640_probe(struct i2c_client *client, | |||
788 | 789 | ||
789 | static int ov9640_remove(struct i2c_client *client) | 790 | static int ov9640_remove(struct i2c_client *client) |
790 | { | 791 | { |
791 | struct ov9640_priv *priv = i2c_get_clientdata(client); | 792 | struct v4l2_subdev *sd = i2c_get_clientdata(client); |
793 | struct ov9640_priv *priv = to_ov9640_sensor(sd); | ||
792 | 794 | ||
793 | kfree(priv); | 795 | kfree(priv); |
794 | return 0; | 796 | return 0; |