Skip to content

Commit b0dc7e7

Browse files
outman119broonie
authored andcommitted
spi: amlogic: spifc-a4: unregister ECC engine on probe failure and remove() callback
aml_sfc_probe() registers the on-host NAND ECC engine, but teardown was missing from both probe unwind and remove-time cleanup. Add a devm cleanup action after successful registration so nand_ecc_unregister_on_host_hw_engine() runs automatically on probe failures and during device removal. Fixes: 4670db6 ("spi: amlogic: add driver for Amlogic SPI Flash Controller") Signed-off-by: Felix Gu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 5340259 commit b0dc7e7

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

drivers/spi/spi-amlogic-spifc-a4.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,13 @@ static const struct nand_ecc_engine_ops aml_sfc_ecc_engine_ops = {
10661066
.finish_io_req = aml_sfc_ecc_finish_io_req,
10671067
};
10681068

1069+
static void aml_sfc_unregister_ecc_engine(void *data)
1070+
{
1071+
struct nand_ecc_engine *eng = data;
1072+
1073+
nand_ecc_unregister_on_host_hw_engine(eng);
1074+
}
1075+
10691076
static int aml_sfc_clk_init(struct aml_sfc *sfc)
10701077
{
10711078
sfc->gate_clk = devm_clk_get_enabled(sfc->dev, "gate");
@@ -1149,6 +1156,11 @@ static int aml_sfc_probe(struct platform_device *pdev)
11491156
if (ret)
11501157
return dev_err_probe(&pdev->dev, ret, "failed to register Aml host ecc engine.\n");
11511158

1159+
ret = devm_add_action_or_reset(dev, aml_sfc_unregister_ecc_engine,
1160+
&sfc->ecc_eng);
1161+
if (ret)
1162+
return dev_err_probe(dev, ret, "failed to add ECC unregister action\n");
1163+
11521164
ret = of_property_read_u32(np, "amlogic,rx-adj", &val);
11531165
if (!ret)
11541166
sfc->rx_adj = val;

0 commit comments

Comments
 (0)