sdio: Fix reference counting in sdio_remove_func()
PATCH 1/1 sdio: Fix reference counting in sdio_remove_func()
sdio_remove_func() needs to be more careful about reference counting. It can be called in error paths where sdio_add_func() has never been called e.g. mmc_attach_sdio error path --> mmc_sdio_remove --> sdio_remove_func
Signed-off-by Daniel Drake <[email protected]>
--- drivers/mmc/core/sdio_bus.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/core/sdio_bus.c +5 -2
@@ -248,12 +248,15 @@ int sdio_add_func(struct sdio_func *func)/* * Unregister a SDIO function with the driver model, and * (eventually) free it. +* This function can be called through error paths where sdio_add_func() was +* never executed (because a failure occurred at an earlier point). */ void sdio_remove_func (struct sdio_func *func) { -if (sdio_func_present (func)) -device_del (&func->dev); +if (!sdio_func_present (func)) +return ; +device_del (&func->dev);put_device (&func->dev); }
Signature · 1 line
1.6.2.5
Quoted 5 lines · Daniel Drake
sdio_remove_func()needs to be more careful about reference counting. It can be called in error paths wheresdio_add_func()has never been called e.g.mmc_attach_sdioerror path -->mmc_sdio_remove-->sdio_remove_funcSigned-off-by Daniel Drake <[email protected]>
Reviewed-by Matt Fleming <[email protected]>