ASoC: Convert WM8955 to devm_kzalloc() (ba5c88d0) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/wm8955.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1007,7 +1007,8 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
		struct wm8955_priv *wm8955;
		int ret;

		wm8955 = kzalloc(sizeof(struct wm8955_priv), GFP_KERNEL);
		wm8955 = devm_kzalloc(&i2c->dev, sizeof(struct wm8955_priv),
		GFP_KERNEL);
		if (wm8955 == NULL)
		return -ENOMEM;

		@@ -1016,15 +1017,13 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,

		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm8955, &wm8955_dai, 1);
		if (ret < 0)
		kfree(wm8955);

		return ret;
		}

		static __devexit int wm8955_i2c_remove(struct i2c_client *client)
		{
		snd_soc_unregister_codec(&client->dev);
		kfree(i2c_get_clientdata(client));
		return 0;
		}