path: root/include
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-19 20:51:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-19 20:51:31 -0800
commit86eaf54d07f239243f674d6256e5c4be6578348a (patch)
treef65f310c37ae140f533967b3f50d36dafa355c64 /include
parentc69bde78f05c34f0f3c1f3025d6214d6e06389f4 (diff)
parent2c5d7407e012721f02741f1adae2b1bdf6ef6449 (diff)
Merge tag 'dmaengine-fix-4.4-rc2' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "This has odd fixes spreadout drivers, not major here - usbdmac fixes for pm - edma build and logic fixes - build warn fixes for few drivers" * tag 'dmaengine-fix-4.4-rc2' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: at_hdmac: use %pad format string for dma_addr_t dmaengine: at_xdmac: use %pad format string for dma_addr_t dmaengine: imx-sdma: remove __init annotation on sdma_event_remap dmaengine: edma: predecence bug in GET_NUM_QDMACH() dmaengine: edma: fix build without CONFIG_OF dmaengine: of_dma: Correct return code for of_dma_request_slave_channel in case !CONFIG_OF dmaengine: sh: usb-dmac: Fix pm_runtime_{enable,disable}() imbalance dmaengine: sh: usb-dmac: Fix crash on runtime suspend
Diffstat (limited to 'include')
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 36112cdd665a..b90d8ec57c1f 100644
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -80,7 +80,7 @@ static inline int of_dma_router_register(struct device_node *np,
static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
const char *name)
- return NULL;
+ return ERR_PTR(-ENODEV);
static inline struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,

Privacy Policy