evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wsa881x-analog: fix overwrite of client->dev->driver_data"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-11 06:47:53 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0690e9e093
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/codecs/wsa881x-analog.c
View file

@ -1309,7 +1309,6 @@ static int wsa881x_i2c_probe(struct i2c_client *client,
ret = -EINVAL;
goto err;
}
i2c_set_clientdata(client, pdata);
dev_set_drvdata(&client->dev, client);
pdata->regmap[WSA881X_DIGITAL_SLAVE] =
@ -1367,7 +1366,7 @@ err:
static int wsa881x_i2c_remove(struct i2c_client *client)
{
struct wsa881x_pdata *wsa881x = i2c_get_clientdata(client);
struct wsa881x_pdata *wsa881x = client->dev.platform_data;
snd_soc_unregister_codec(&client->dev);
i2c_set_clientdata(client, NULL);