diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-11-03 11:28:10 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-11-16 04:33:21 +0100 |
| commit | 500404ebcbd074ca11aa0c3fd9a268aa4054fd8b (patch) | |
| tree | f95552b9bac09f02c92b482b96ad4596af1e2f80 | |
| parent | dmaengine: sh: usb-dmac: Fix pm_runtime_{enable,disable}() imbalance (diff) | |
| download | linux-500404ebcbd074ca11aa0c3fd9a268aa4054fd8b.tar.xz linux-500404ebcbd074ca11aa0c3fd9a268aa4054fd8b.zip | |
dmaengine: of_dma: Correct return code for of_dma_request_slave_channel in case !CONFIG_OF
of_dma_request_slave_channel should return either pointer for valid
dma_chan or ERR_PTR() error code, NULL is not expected to be returned.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | include/linux/of_dma.h | 2 |
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, |