diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-12-04 02:42:13 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-12-04 02:44:09 +0300 |
| commit | 55fd59b003f6e8fd88cf16590e79823d7ccf3026 (patch) | |
| tree | f23b2225f1a00b80632d612428708d5a57ad330b /drivers/net/can/m_can | |
| parent | a4390e966f952510808b10ce7ae2a7dd2a08c0e5 (diff) | |
| parent | bbe2ba04c5a92a49db8a42c850a5a2f6481e47eb (diff) | |
| download | linux-55fd59b003f6e8fd88cf16590e79823d7ccf3026.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/can/m_can')
| -rw-r--r-- | drivers/net/can/m_can/tcan4x5x.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c index 483a78dca17e..a0fecc3fb829 100644 --- a/drivers/net/can/m_can/tcan4x5x.c +++ b/drivers/net/can/m_can/tcan4x5x.c @@ -479,18 +479,18 @@ static int tcan4x5x_can_probe(struct spi_device *spi) spi->bits_per_word = 32; ret = spi_setup(spi); if (ret) - goto out_clk; + goto out_m_can_class_free_dev; priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus, &spi->dev, &tcan4x5x_regmap); if (IS_ERR(priv->regmap)) { ret = PTR_ERR(priv->regmap); - goto out_clk; + goto out_m_can_class_free_dev; } ret = tcan4x5x_power_enable(priv->power, 1); if (ret) - goto out_clk; + goto out_m_can_class_free_dev; ret = tcan4x5x_get_gpios(mcan_class); if (ret) @@ -509,11 +509,6 @@ static int tcan4x5x_can_probe(struct spi_device *spi) out_power: tcan4x5x_power_enable(priv->power, 0); -out_clk: - if (!IS_ERR(mcan_class->cclk)) { - clk_disable_unprepare(mcan_class->cclk); - clk_disable_unprepare(mcan_class->hclk); - } out_m_can_class_free_dev: m_can_class_free_dev(mcan_class->net); return ret; |