diff --git a/[refs] b/[refs]
index 2d139c6d860d..224a24a1a700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be4ff9612271ac63e16bb2a8e6666e62538b60ea
+refs/heads/master: 275708f88d3dce0728e2d099b5de8ebc0f15c69a
diff --git a/trunk/sound/soc/codecs/tpa6130a2.c b/trunk/sound/soc/codecs/tpa6130a2.c
index 239e0c461068..b2572c451c35 100644
--- a/trunk/sound/soc/codecs/tpa6130a2.c
+++ b/trunk/sound/soc/codecs/tpa6130a2.c
@@ -446,7 +446,6 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
 		gpio_free(data->power_gpio);
 err_gpio:
 	kfree(data);
-	i2c_set_clientdata(tpa6130a2_client, NULL);
 	tpa6130a2_client = NULL;
 
 	return ret;