|
@@ -1557,7 +1557,8 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
|
|
|
struct wm8753_priv *wm8753;
|
|
|
int ret;
|
|
|
|
|
|
- wm8753 = kzalloc(sizeof(struct wm8753_priv), GFP_KERNEL);
|
|
|
+ wm8753 = devm_kzalloc(&spi->dev, sizeof(struct wm8753_priv),
|
|
|
+ GFP_KERNEL);
|
|
|
if (wm8753 == NULL)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -1580,7 +1581,6 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
|
|
|
err_regmap:
|
|
|
regmap_exit(wm8753->regmap);
|
|
|
err:
|
|
|
- kfree(wm8753);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -1612,7 +1612,8 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
|
|
|
struct wm8753_priv *wm8753;
|
|
|
int ret;
|
|
|
|
|
|
- wm8753 = kzalloc(sizeof(struct wm8753_priv), GFP_KERNEL);
|
|
|
+ wm8753 = devm_kzalloc(&i2c->dev, sizeof(struct wm8753_priv),
|
|
|
+ GFP_KERNEL);
|
|
|
if (wm8753 == NULL)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -1632,10 +1633,10 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
|
|
|
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
|
|
|
goto err_regmap;
|
|
|
}
|
|
|
+
|
|
|
err_regmap:
|
|
|
regmap_exit(wm8753->regmap);
|
|
|
err:
|
|
|
- kfree(wm8753);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -1645,7 +1646,6 @@ static __devexit int wm8753_i2c_remove(struct i2c_client *client)
|
|
|
|
|
|
snd_soc_unregister_codec(&client->dev);
|
|
|
regmap_exit(wm8753->regmap);
|
|
|
- kfree(wm8753);
|
|
|
return 0;
|
|
|
}
|
|
|
|