diff options
| -rw-r--r-- | drivers/mfd/apalis-tk1-k20.c | 3 | ||||
| -rw-r--r-- | drivers/spi/spi-tegra114.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mfd/apalis-tk1-k20.c b/drivers/mfd/apalis-tk1-k20.c index 8d3227a18912..78c6af88c625 100644 --- a/drivers/mfd/apalis-tk1-k20.c +++ b/drivers/mfd/apalis-tk1-k20.c @@ -1028,6 +1028,9 @@ static int apalis_tk1_k20_spi_remove(struct spi_device *spi) if (apalis_tk1_k20->int2_gpio >= 0) gpio_free(apalis_tk1_k20->int2_gpio); + kfree(spi->controller_data); + spi->controller_data = NULL; + mfd_remove_devices(&spi->dev); regmap_del_irq_chip(apalis_tk1_k20->irq, apalis_tk1_k20->irq_data); mutex_destroy(&apalis_tk1_k20->lock); diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index 400a8a464ce2..d2a7d572a0c4 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -863,7 +863,7 @@ static struct tegra_spi_device_controller_data return NULL; } - cdata = devm_kzalloc(&spi->dev, sizeof(*cdata), + cdata = kzalloc(sizeof(*cdata), GFP_KERNEL); if (!cdata) { dev_err(&spi->dev, "Memory alloc for cdata failed\n"); @@ -915,7 +915,7 @@ static int tegra_spi_setup(struct spi_device *spi) spi->controller_data = cdata; } - /* Set speed to the spi max fequency if spi device has not set */ + /* Set speed to the spi max frequency if spi device has not set */ spi->max_speed_hz = spi->max_speed_hz ? : tspi->spi_max_frequency; ret = pm_runtime_get_sync(tspi->dev); |