From f218391df9caf5f486279ae1947ad760ce52392e Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Wed, 10 Nov 2010 11:14:13 -0300
Subject: [PATCH] --- yaml --- r: 226257 b: refs/heads/master c:
 c0ff9f4c24a2571943c0d0991c2cb9ac90dc1915 h: refs/heads/master i:   226255:
 8d33a7b48920308e9e9feca56d335907fc367d21 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/imx074.c     | 2 +-
 trunk/drivers/media/video/mt9m001.c    | 1 -
 trunk/drivers/media/video/mt9m111.c    | 1 -
 trunk/drivers/media/video/mt9t031.c    | 1 -
 trunk/drivers/media/video/mt9v022.c    | 1 -
 trunk/drivers/media/video/rj54n1cb0c.c | 1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8018f13ca469..5c4f27b26d2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a9dcb4a19c29ec01e7d249e3dae2d589af86480
+refs/heads/master: c0ff9f4c24a2571943c0d0991c2cb9ac90dc1915
diff --git a/trunk/drivers/media/video/imx074.c b/trunk/drivers/media/video/imx074.c
index 27b5dfdfbb93..b9c91c1839f8 100644
--- a/trunk/drivers/media/video/imx074.c
+++ b/trunk/drivers/media/video/imx074.c
@@ -467,7 +467,7 @@ static int imx074_remove(struct i2c_client *client)
 	icd->ops = NULL;
 	if (icl->free_bus)
 		icl->free_bus(icl);
-	client->driver = NULL;
+	i2c_set_clientdata(client, NULL);
 	kfree(priv);
 
 	return 0;
diff --git a/trunk/drivers/media/video/mt9m001.c b/trunk/drivers/media/video/mt9m001.c
index fcb4cd941853..f7fc88d240e6 100644
--- a/trunk/drivers/media/video/mt9m001.c
+++ b/trunk/drivers/media/video/mt9m001.c
@@ -798,7 +798,6 @@ static int mt9m001_remove(struct i2c_client *client)
 
 	icd->ops = NULL;
 	mt9m001_video_remove(icd);
-	client->driver = NULL;
 	kfree(mt9m001);
 
 	return 0;
diff --git a/trunk/drivers/media/video/mt9m111.c b/trunk/drivers/media/video/mt9m111.c
index 525a16e73285..53fa2a7bf156 100644
--- a/trunk/drivers/media/video/mt9m111.c
+++ b/trunk/drivers/media/video/mt9m111.c
@@ -1092,7 +1092,6 @@ static int mt9m111_remove(struct i2c_client *client)
 	struct soc_camera_device *icd = client->dev.platform_data;
 
 	icd->ops = NULL;
-	client->driver = NULL;
 	kfree(mt9m111);
 
 	return 0;
diff --git a/trunk/drivers/media/video/mt9t031.c b/trunk/drivers/media/video/mt9t031.c
index 9bd44a816ea1..7ce279c3751d 100644
--- a/trunk/drivers/media/video/mt9t031.c
+++ b/trunk/drivers/media/video/mt9t031.c
@@ -896,7 +896,6 @@ static int mt9t031_remove(struct i2c_client *client)
 
 	if (icd)
 		icd->ops = NULL;
-	client->driver = NULL;
 	kfree(mt9t031);
 
 	return 0;
diff --git a/trunk/drivers/media/video/mt9v022.c b/trunk/drivers/media/video/mt9v022.c
index b96171cc79f9..6a784c87e5ff 100644
--- a/trunk/drivers/media/video/mt9v022.c
+++ b/trunk/drivers/media/video/mt9v022.c
@@ -930,7 +930,6 @@ static int mt9v022_remove(struct i2c_client *client)
 
 	icd->ops = NULL;
 	mt9v022_video_remove(icd);
-	client->driver = NULL;
 	kfree(mt9v022);
 
 	return 0;
diff --git a/trunk/drivers/media/video/rj54n1cb0c.c b/trunk/drivers/media/video/rj54n1cb0c.c
index d2fa2d43ff19..57e11b6f19fb 100644
--- a/trunk/drivers/media/video/rj54n1cb0c.c
+++ b/trunk/drivers/media/video/rj54n1cb0c.c
@@ -1460,7 +1460,6 @@ static int rj54n1_remove(struct i2c_client *client)
 	icd->ops = NULL;
 	if (icl->free_bus)
 		icl->free_bus(icl);
-	client->driver = NULL;
 	kfree(rj54n1);
 
 	return 0;