Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e5132d8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 7fa9c481 2a9515b0

sound/soc/codecs/wsa881x-analog.c

+1 −2
Original line number Diff line number Diff line
@@ -1313,7 +1313,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] =
@@ -1371,7 +1370,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);