From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Jarzmik Subject: Re: [PATCH 1/3] spi: pxa2xx: handle error of pxa2xx_spi_dma_prepare() Date: Wed, 23 Mar 2016 19:15:32 +0100 Message-ID: <87fuvhrrgb.fsf@belgarion.home> References: <1458746964-9335-1-git-send-email-jarkko.nikula@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain Cc: linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Mark Brown , Daniel Mack , Haojian Zhuang , Mika Westerberg , Andy Shevchenko To: Jarkko Nikula Return-path: In-Reply-To: <1458746964-9335-1-git-send-email-jarkko.nikula-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> (Jarkko Nikula's message of "Wed, 23 Mar 2016 17:29:22 +0200") Sender: linux-spi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Jarkko Nikula writes: > From: Andy Shevchenko > > If by some reason pxa2xx_spi_dma_prepare() fails we have not to ignore its > error. In such case we abort the transfer and return the error to upper > level. > > Signed-off-by: Andy Shevchenko > Signed-off-by: Jarkko Nikula > --- > Reposting Andy's fix from December that got buried to list during > holidays. > --- > drivers/spi/spi-pxa2xx.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c > index 85e59a406a4c..47bdbd350a24 100644 > --- a/drivers/spi/spi-pxa2xx.c > +++ b/drivers/spi/spi-pxa2xx.c > @@ -928,6 +928,7 @@ static void pump_transfers(unsigned long data) > u32 dma_thresh = drv_data->cur_chip->dma_threshold; > u32 dma_burst = drv_data->cur_chip->dma_burst_size; > u32 change_mask = pxa2xx_spi_get_ssrc1_change_mask(drv_data); > + int err; > > /* Get current state information */ > message = drv_data->cur_msg; > @@ -1047,7 +1048,12 @@ static void pump_transfers(unsigned long data) > /* Ensure we have the correct interrupt handler */ > drv_data->transfer_handler = pxa2xx_spi_dma_transfer; > > - pxa2xx_spi_dma_prepare(drv_data, dma_burst); > + err = pxa2xx_spi_dma_prepare(drv_data, dma_burst); > + if (err) { > + message->status = err; > + giveback(drv_data); > + return; > + } Hi Jarrko, Even if this patch is perfectly fine, isn't pxa2xx_spi_dma_prepare() leaking tx_desc if its rx_desc allocation failed ? If so, wouldn't it make sense to add it to this patch ? Cheers. -- Robert -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html