diff --git a/[refs] b/[refs]
index a83af095d888..a4e86cd4048f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1330b0dcf876201bda0872ea32d64c190384defc
+refs/heads/master: 2967b0ad3302d8627c0d99bfed4b8f167e21fdee
diff --git a/trunk/drivers/video/backlight/adp8870_bl.c b/trunk/drivers/video/backlight/adp8870_bl.c
index 98e0304deeaf..6c68a6899e87 100644
--- a/trunk/drivers/video/backlight/adp8870_bl.c
+++ b/trunk/drivers/video/backlight/adp8870_bl.c
@@ -931,7 +931,6 @@ static int __devinit adp8870_probe(struct i2c_client *client,
 out1:
 	backlight_device_unregister(bl);
 out2:
-	i2c_set_clientdata(client, NULL);
 	kfree(data);
 
 	return ret;
@@ -951,7 +950,6 @@ static int __devexit adp8870_remove(struct i2c_client *client)
 			&adp8870_bl_attr_group);
 
 	backlight_device_unregister(data->bl);
-	i2c_set_clientdata(client, NULL);
 	kfree(data);
 
 	return 0;