summaryrefslogtreecommitdiff
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-04-20 11:44:46 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-23 04:09:13 +0400
commitc8705082404823a5bb3e02a32ba0764399b9e6f2 (patch)
tree1853345f3c0ca963365ff9a07fd2d92e09454799 /include/linux/device.h
parent4a03d6f7c863a039b937649a93341615f531358e (diff)
downloadlinux-c8705082404823a5bb3e02a32ba0764399b9e6f2.tar.xz
driver core: let dev_set_drvdata return int instead of void as it can fail
Before commit b402843 (Driver core: move dev_get/set_drvdata to drivers/base/dd.c) calling dev_set_drvdata with dev=NULL was an unchecked error. After some discussion about what to return in this case removing the check (and so producing a null pointer exception) seems fine. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 350ceda4de97..2215d013ca96 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -557,7 +557,7 @@ extern int device_move(struct device *dev, struct device *new_parent,
extern const char *device_get_devnode(struct device *dev,
mode_t *mode, const char **tmp);
extern void *dev_get_drvdata(const struct device *dev);
-extern void dev_set_drvdata(struct device *dev, void *data);
+extern int dev_set_drvdata(struct device *dev, void *data);
/*
* Root device objects for grouping under /sys/devices