Merge tag 'spi-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[sfrench/cifs-2.6.git] / drivers / spi / spi-cs42l43.c

diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c
index adf19e8c4c8a0d1ef9ede14374e8ab6638073a82..27c995b657f2c66b58efcf8a24103e419c9cb71f 100644 (file)
--- a/drivers/spi/spi-cs42l43.c
+++ b/drivers/spi/spi-cs42l43.c
@@ -201,6 +201,11 @@ static size_t cs42l43_spi_max_length(struct spi_device *spi)
        return CS42L43_SPI_MAX_LENGTH;
 }
 
+static void cs42l43_release_of_node(void *data)
+{
+       fwnode_handle_put(data);
+}
+
 static int cs42l43_spi_probe(struct platform_device *pdev)
 {
        struct cs42l43 *cs42l43 = dev_get_drvdata(pdev->dev.parent);
@@ -227,12 +232,6 @@ static int cs42l43_spi_probe(struct platform_device *pdev)
        priv->ctlr->transfer_one = cs42l43_transfer_one;
        priv->ctlr->set_cs = cs42l43_set_cs;
        priv->ctlr->max_transfer_size = cs42l43_spi_max_length;
-
-       if (is_of_node(fwnode))
-               fwnode = fwnode_get_named_child_node(fwnode, "spi");
-
-       device_set_node(&priv->ctlr->dev, fwnode);
-
        priv->ctlr->mode_bits = SPI_3WIRE | SPI_MODE_X_MASK;
        priv->ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX;
        priv->ctlr->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16) |
@@ -256,6 +255,17 @@ static int cs42l43_spi_probe(struct platform_device *pdev)
        regmap_write(priv->regmap, CS42L43_SPI_CONFIG3, 0);
        regmap_write(priv->regmap, CS42L43_SPI_CONFIG4, CS42L43_SPI_STALL_ENA_MASK);
 
+       if (is_of_node(fwnode)) {
+               fwnode = fwnode_get_named_child_node(fwnode, "spi");
+               ret = devm_add_action(priv->dev, cs42l43_release_of_node, fwnode);
+               if (ret) {
+                       fwnode_handle_put(fwnode);
+                       return ret;
+               }
+       }
+
+       device_set_node(&priv->ctlr->dev, fwnode);
+
        ret = devm_spi_register_controller(priv->dev, priv->ctlr);
        if (ret) {
                dev_err(priv->dev, "Failed to register SPI controller: %d\n", ret);