浏览代码

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>
Alexander Aring 10 年之前
父节点
当前提交
a339e1849b
共有 1 个文件被更改,包括 7 次插入10 次删除
  1. 7 10
      drivers/net/ieee802154/mrf24j40.c

+ 7 - 10
drivers/net/ieee802154/mrf24j40.c

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