OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spi: fix resource leak for drivers without .remove callback 

[ Upstream commit 440408dbadfe47a615afd0a0a4a402e629be658a ]

Consider an spi driver with a .probe but without a .remove callback (e.g.
rtc-ds1347). The function spi_drv_probe() is called to bind a device and
so dev_pm_domain_attach() is called. As there is no remove callback
spi_drv_remove() isn't called at unbind time however and so calling
dev_pm_domain_detach() is missed and the pm domain keeps active.

To fix this always use both spi_drv_probe() and spi_drv_remove() and
make them handle the respective callback not being set. This has the
side effect that for a (hypothetical) driver that has neither .probe nor
remove the clk and pm domain setup is done.

Fixes: 33cf00e570 ("spi: attach/detach SPI device to the ACPI power domain")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20201119161604.2633521-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Uwe Kleine-König 2020-11-19 17:16:02 +01:00 committed by Greg Kroah-Hartman
parent 70e19fccf6
commit 82b9934e1e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/spi/spi.c
View File

@ -405,9 +405,11 @@ static int spi_drv_probe(struct device *dev)
if (ret) if (ret)
return ret; return ret;
ret = sdrv->probe(spi); if (sdrv->probe) {
if (ret) ret = sdrv->probe(spi);
dev_pm_domain_detach(dev, true); if (ret)
dev_pm_domain_detach(dev, true);
}
return ret; return ret;
} }
@ -415,9 +417,10 @@ static int spi_drv_probe(struct device *dev)
static int spi_drv_remove(struct device *dev) static int spi_drv_remove(struct device *dev)
{ {
const struct spi_driver *sdrv = to_spi_driver(dev->driver); const struct spi_driver *sdrv = to_spi_driver(dev->driver);
int ret; int ret = 0;
ret = sdrv->remove(to_spi_device(dev)); if (sdrv->remove)
ret = sdrv->remove(to_spi_device(dev));
dev_pm_domain_detach(dev, true); dev_pm_domain_detach(dev, true);
return ret; return ret;
@ -442,10 +445,8 @@ int __spi_register_driver(struct module *owner, struct spi_driver *sdrv)
{ {
sdrv->driver.owner = owner; sdrv->driver.owner = owner;
sdrv->driver.bus = &spi_bus_type; sdrv->driver.bus = &spi_bus_type;
if (sdrv->probe) sdrv->driver.probe = spi_drv_probe;
sdrv->driver.probe = spi_drv_probe; sdrv->driver.remove = spi_drv_remove;
if (sdrv->remove)
sdrv->driver.remove = spi_drv_remove;
if (sdrv->shutdown) if (sdrv->shutdown)
sdrv->driver.shutdown = spi_drv_shutdown; sdrv->driver.shutdown = spi_drv_shutdown;
return driver_register(&sdrv->driver); return driver_register(&sdrv->driver);