未验证 提交 7b9c94bd 编写于 作者: L Lukas Wunner 提交者: Mark Brown

spi: amd: Fix refcount underflow on remove

The AMD SPI driver calls spi_master_put() in its ->remove() hook even
though the preceding call to spi_unregister_master() already drops a
ref, thus leading to a refcount underflow.  Drop the superfluous call
to spi_master_put().

This only leaves the call to spi_unregister_master() in the ->remove()
hook, so it's safe to change the ->probe() hook to use the devm version
of spi_register_master() and drop the ->remove() hook altogether.
Signed-off-by: NLukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/5e53ccdf1eecd4e015dba99d0d77389107f8a2e3.1588590210.git.lukas@wunner.deSigned-off-by: NMark Brown <broonie@kernel.org>
上级 4332ea8f
...@@ -282,7 +282,7 @@ static int amd_spi_probe(struct platform_device *pdev) ...@@ -282,7 +282,7 @@ static int amd_spi_probe(struct platform_device *pdev)
master->transfer_one_message = amd_spi_master_transfer; master->transfer_one_message = amd_spi_master_transfer;
/* Register the controller with SPI framework */ /* Register the controller with SPI framework */
err = spi_register_master(master); err = devm_spi_register_master(dev, master);
if (err) { if (err) {
dev_err(dev, "error %d registering SPI controller\n", err); dev_err(dev, "error %d registering SPI controller\n", err);
goto err_free_master; goto err_free_master;
...@@ -296,16 +296,6 @@ static int amd_spi_probe(struct platform_device *pdev) ...@@ -296,16 +296,6 @@ static int amd_spi_probe(struct platform_device *pdev)
return err; return err;
} }
static int amd_spi_remove(struct platform_device *pdev)
{
struct amd_spi *amd_spi = platform_get_drvdata(pdev);
spi_unregister_master(amd_spi->master);
spi_master_put(amd_spi->master);
return 0;
}
static const struct acpi_device_id spi_acpi_match[] = { static const struct acpi_device_id spi_acpi_match[] = {
{ "AMDI0061", 0 }, { "AMDI0061", 0 },
{}, {},
...@@ -318,7 +308,6 @@ static struct platform_driver amd_spi_driver = { ...@@ -318,7 +308,6 @@ static struct platform_driver amd_spi_driver = {
.acpi_match_table = ACPI_PTR(spi_acpi_match), .acpi_match_table = ACPI_PTR(spi_acpi_match),
}, },
.probe = amd_spi_probe, .probe = amd_spi_probe,
.remove = amd_spi_remove,
}; };
module_platform_driver(amd_spi_driver); module_platform_driver(amd_spi_driver);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册