summaryrefslogtreecommitdiff
path: root/include/linux/of_dma.h
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2016-01-08 02:51:13 +0300
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2016-01-08 02:51:13 +0300
commitabaee091a18c19ccd86feb1c8374585d82e96777 (patch)
tree01602bae73e1278c3d98dafe1c269049927c58ce /include/linux/of_dma.h
parenta2746fb16e41b7c8f02aa4d2605ecce97abbebbd (diff)
parent3f8d6f2a0797e8c650a47e5c1b5c2601a46f4293 (diff)
downloadlinux-abaee091a18c19ccd86feb1c8374585d82e96777.tar.xz
Merge branch 'jejb-scsi' into misc
Diffstat (limited to 'include/linux/of_dma.h')
-rw-r--r--include/linux/of_dma.h2
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,