diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-04-20 09:44:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-22 17:09:13 -0700 |
| commit | c8705082404823a5bb3e02a32ba0764399b9e6f2 (patch) | |
| tree | 1853345f3c0ca963365ff9a07fd2d92e09454799 | |
| parent | 4a03d6f7c863a039b937649a93341615f531358e (diff) | |
| download | op-kernel-dev-c8705082404823a5bb3e02a32ba0764399b9e6f2.zip op-kernel-dev-c8705082404823a5bb3e02a32ba0764399b9e6f2.tar.gz | |
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>
| -rw-r--r-- | drivers/base/dd.c | 7 | ||||
| -rw-r--r-- | include/linux/device.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 7e9219b..e3a3eff 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -413,17 +413,16 @@ void *dev_get_drvdata(const struct device *dev) } EXPORT_SYMBOL(dev_get_drvdata); -void dev_set_drvdata(struct device *dev, void *data) +int dev_set_drvdata(struct device *dev, void *data) { int error; - if (!dev) - return; if (!dev->p) { error = device_private_init(dev); if (error) - return; + return error; } dev->p->driver_data = data; + return 0; } EXPORT_SYMBOL(dev_set_drvdata); diff --git a/include/linux/device.h b/include/linux/device.h index 350ceda..2215d01 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 |
