diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-10 10:46:50 +0300 |
|---|---|---|
| committer | Dan Williams <djbw@fb.com> | 2013-08-22 22:57:42 -0700 |
| commit | 71ea148370f8b6c745a8a42f6fd983cf5ebade18 (patch) | |
| tree | da4fbe3924d48613c02b478d10e63c30524a7364 /include/linux | |
| parent | c4dcf0e2dd7e06db0c5c3f396b2e2b9ce1f6d19f (diff) | |
| download | linux-stable-71ea148370f8b6c745a8a42f6fd983cf5ebade18.tar.gz linux-stable-71ea148370f8b6c745a8a42f6fd983cf5ebade18.tar.bz2 linux-stable-71ea148370f8b6c745a8a42f6fd983cf5ebade18.zip | |
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 <dan.carpenter@oracle.com>
Signed-off-by: Dan Williams <djbw@fb.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dmaengine.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index cb286b1acdb6..b3ba7e410943 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 |