openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mrf24j40: calling ieee802154_register_hw at last 

The function ieee802154_register_hw should always called at last.
Currently we do hardware init and such things after register hardware
into the subsystem. It could be that the subsystem already call driver
operations while running hardware init.

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2015-09-21 11:24:24 +02:00 committed by Marcel Holtmann
parent b2cfdf3c67
commit a339e1849b
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ieee802154/mrf24j40.c
View File

@ -753,14 +753,9 @@ static int mrf24j40_probe(struct spi_device *spi)
mutex_init(&devrec->buffer_mutex);
init_completion(&devrec->tx_complete);
dev_dbg(printdev(devrec), "registered mrf24j40\n");
ret = ieee802154_register_hw(devrec->hw);
if (ret)
goto err_register_device;
ret = mrf24j40_hw_init(devrec);
if (ret)
goto err_hw_init;
goto err_register_device;
ret = devm_request_threaded_irq(&spi->dev,
spi->irq,
@ -772,14 +767,16 @@ static int mrf24j40_probe(struct spi_device *spi)
if (ret) {
dev_err(printdev(devrec), "Unable to get IRQ");
goto err_irq;
goto err_register_device;
}
dev_dbg(printdev(devrec), "registered mrf24j40\n");
ret = ieee802154_register_hw(devrec->hw);
if (ret)
goto err_register_device;
return 0;
err_irq:
err_hw_init:
ieee802154_unregister_hw(devrec->hw);
err_register_device:
ieee802154_free_hw(devrec->hw);
err_ret: