Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb55f4f5 authored by Qinglang Miao's avatar Qinglang Miao Committed by Greg Kroah-Hartman
Browse files

spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe 



commit 702b15cb97123cedcec56a39d9a21c5288eb9ae1 upstream.

Fix the missing clk_disable_unprepare() before return
from mt7621_spi_probe in the error handling case.

Fixes: cbd66c626e16 ("spi: mt7621: Move SPI driver out of staging")
Signed-off-by: default avatarQinglang Miao <miaoqinglang@huawei.com>
Link: https://lore.kernel.org/r/20201103074912.195576-1-miaoqinglang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66f3bc09

drivers/staging/mt7621-spi/spi-mt7621.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -455,6 +455,7 @@ static int mt7621_spi_probe(struct platform_device *pdev) 
	master = spi_alloc_master(&pdev->dev, sizeof(*rs));

	master = spi_alloc_master(&pdev->dev, sizeof(*rs));

	if (master == NULL) {

	if (master == NULL) {

		dev_info(&pdev->dev, "master allocation failed\n");

		dev_info(&pdev->dev, "master allocation failed\n");

		clk_disable_unprepare(clk);

		return -ENOMEM;

		return -ENOMEM;

	}

	}
@@ -480,6 +481,7 @@ static int mt7621_spi_probe(struct platform_device *pdev) 
	ret = device_reset(&pdev->dev);

	ret = device_reset(&pdev->dev);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "SPI reset failed!\n");

		dev_err(&pdev->dev, "SPI reset failed!\n");

		clk_disable_unprepare(clk);

		return ret;

		return ret;

	}

	}