From 4deab5b86733a72b3f99eb7b3ac3e31ce79b0a9c Mon Sep 17 00:00:00 2001 From: David Cohen Date: Wed, 8 Dec 2010 09:13:59 -0300 Subject: [PATCH] --- yaml --- r: 226411 b: refs/heads/master c: 63c9718c1a4595d51f5b70ed4aed6cee5aea875b h: refs/heads/master i: 226409: 9b4656ad8a4d0aa716632d87328809a482bb21df 226407: 6c749d42e98ad5b8f78765471600ec1c2688b1d5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ov9640.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b586e972d3ab..db95cf36c622 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7b74f76a3a5bcad4d2e8db76834253a63977545 +refs/heads/master: 63c9718c1a4595d51f5b70ed4aed6cee5aea875b diff --git a/trunk/drivers/media/video/ov9640.c b/trunk/drivers/media/video/ov9640.c index c6d8e8a88d2d..53d88a2ab920 100644 --- a/trunk/drivers/media/video/ov9640.c +++ b/trunk/drivers/media/video/ov9640.c @@ -651,7 +651,8 @@ static int ov9640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) static int ov9640_video_probe(struct soc_camera_device *icd, struct i2c_client *client) { - struct ov9640_priv *priv = i2c_get_clientdata(client); + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov9640_priv *priv = to_ov9640_sensor(sd); u8 pid, ver, midh, midl; const char *devname; int ret = 0; @@ -788,7 +789,8 @@ static int ov9640_probe(struct i2c_client *client, static int ov9640_remove(struct i2c_client *client) { - struct ov9640_priv *priv = i2c_get_clientdata(client); + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov9640_priv *priv = to_ov9640_sensor(sd); kfree(priv); return 0;