1 files changed, 9 insertions, 4 deletions

diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 239e0c461068..7eeca79d7387 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -33,6 +33,11 @@
 
 #include "tpa6130a2.h"
 
+enum tpa_model {
+        TPA6130A2,
+        TPA6140A2,
+};
+
 static struct i2c_client *tpa6130a2_client;
 
 /* This struct is used to save the context */
@@ -383,7 +388,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
 
         pdata = client->dev.platform_data;
         data->power_gpio = pdata->power_gpio;
-        data->id = pdata->id;
+        data->id = id->driver_data;
 
         mutex_init(&data->mutex);
 
@@ -405,7 +410,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client,
         switch (data->id) {
         default:
                 dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",
-                         pdata->id);
+                         data->id);
         case TPA6130A2:
                 regulator = "Vdd";
                 break;
@@ -446,7 +451,6 @@ err_regulator:
                 gpio_free(data->power_gpio);
 err_gpio:
         kfree(data);
-        i2c_set_clientdata(tpa6130a2_client, NULL);
         tpa6130a2_client = NULL;
 
         return ret;
@@ -470,7 +474,8 @@ static int __devexit tpa6130a2_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tpa6130a2_id[] = {
-        { "tpa6130a2", 0 },
+        { "tpa6130a2", TPA6130A2 },
+        { "tpa6140a2", TPA6140A2 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, tpa6130a2_id);