diff options
author | Kuninori Morimoto <morimoto.kuninori@renesas.com> | 2008-12-29 04:04:37 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:29 -0500 |
commit | 77fe3d4a44f76653263eb8671d7909ab0fdafd71 (patch) | |
tree | cda4c1f3afeac2365821e2ce62dccbd73cfca258 /drivers/media | |
parent | 7dcb212eee1d3833073ba0458ca5a603b7b05cc5 (diff) |
V4L/DVB (10097): ov772x: clear i2c client data on error and remove
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.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/ov772x.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index e7fb553c906e..b3346c934bf3 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -942,8 +942,10 @@ static int ov772x_probe(struct i2c_client *client, | |||
942 | 942 | ||
943 | ret = soc_camera_device_register(icd); | 943 | ret = soc_camera_device_register(icd); |
944 | 944 | ||
945 | if (ret) | 945 | if (ret) { |
946 | i2c_set_clientdata(client, NULL); | ||
946 | kfree(priv); | 947 | kfree(priv); |
948 | } | ||
947 | 949 | ||
948 | return ret; | 950 | return ret; |
949 | } | 951 | } |
@@ -953,6 +955,7 @@ static int ov772x_remove(struct i2c_client *client) | |||
953 | struct ov772x_priv *priv = i2c_get_clientdata(client); | 955 | struct ov772x_priv *priv = i2c_get_clientdata(client); |
954 | 956 | ||
955 | soc_camera_device_unregister(&priv->icd); | 957 | soc_camera_device_unregister(&priv->icd); |
958 | i2c_set_clientdata(client, NULL); | ||
956 | kfree(priv); | 959 | kfree(priv); |
957 | return 0; | 960 | return 0; |
958 | } | 961 | } |