From: Dan Carpenter Date: Sat, 10 Aug 2013 07:46:50 +0000 (+0300) Subject: dmaengine: make dma_submit_error() return an error code X-Git-Tag: v3.12-rc1~74^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71ea148370f8b6c745a8a42f6fd983cf5ebade18;p=profile%2Fivi%2Fkernel-x86-ivi.git dmaengine: make dma_submit_error() return an error code The problem here is that the dma_xfer() functions in drivers/ata/pata_arasan_cf.c and drivers/mtd/nand/fsmc_nand.c expect dma_submit_error() to return an error code so they return 1 when they intended to return a negative. So far as I can tell, none of the ->tx_submit() functions ever do return error codes so this patch should have no effect in the current code. I also changed it from a define to an inline. Signed-off-by: Dan Carpenter Signed-off-by: Dan Williams --- diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index cb286b1..b3ba7e4 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -38,7 +38,10 @@ typedef s32 dma_cookie_t; #define DMA_MIN_COOKIE 1 #define DMA_MAX_COOKIE INT_MAX -#define dma_submit_error(cookie) ((cookie) < 0 ? 1 : 0) +static inline int dma_submit_error(dma_cookie_t cookie) +{ + return cookie < 0 ? cookie : 0; +} /** * enum dma_status - DMA transaction status