From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Brugger Subject: Re: [RESEND PATCH] spi: mediatek: fix wrong error return value on probe Date: Fri, 18 Sep 2015 23:04:54 +0200 Message-ID: <2905291.oz4bWkMeg3@ubix> References: <1442321205-30869-1-git-send-email-javier@osg.samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Cc: linux-kernel@vger.kernel.org, Mark Brown , linux-spi@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org To: Javier Martinez Canillas Return-path: In-Reply-To: <1442321205-30869-1-git-send-email-javier@osg.samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-spi.vger.kernel.org On Tuesday, September 15, 2015 02:46:45 PM Javier Martinez Canillas wrote: > Commit adcbcfea15d62 ("spi: mediatek: fix spi clock usage error") > added a new sel_clk but introduced bugs in the error paths since > the wrong struct clk pointers are passed to PTR_ERR(). > > Fixes: adcbcfea15d62 ("spi: mediatek: fix spi clock usage error") > Signed-off-by: Javier Martinez Canillas > Reviewed-by: Matthias Brugger > --- > Patch based on git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git > branch fix/mediatek but also applies cleanly to branch for-linus. > > It's the exact same patch than before so I don't know what went wrong. > > drivers/spi/spi-mt65xx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c > index 6fbb5e5132b0..e9839a4e0175 100644 > --- a/drivers/spi/spi-mt65xx.c > +++ b/drivers/spi/spi-mt65xx.c > @@ -585,14 +585,14 @@ static int mtk_spi_probe(struct platform_device *pdev) > > mdata->sel_clk = devm_clk_get(&pdev->dev, "sel-clk"); > if (IS_ERR(mdata->sel_clk)) { > - ret = PTR_ERR(mdata->spi_clk); > + ret = PTR_ERR(mdata->sel_clk); > dev_err(&pdev->dev, "failed to get sel-clk: %d\n", ret); > goto err_put_master; > } > > mdata->spi_clk = devm_clk_get(&pdev->dev, "spi-clk"); > if (IS_ERR(mdata->spi_clk)) { > - ret = PTR_ERR(mdata->parent_clk); > + ret = PTR_ERR(mdata->spi_clk); > dev_err(&pdev->dev, "failed to get spi-clk: %d\n", ret); > goto err_put_master; > }