aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-04-20 03:44:46 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-22 20:09:13 -0400
commitc8705082404823a5bb3e02a32ba0764399b9e6f2 (patch)
tree1853345f3c0ca963365ff9a07fd2d92e09454799 /drivers/base
parent4a03d6f7c863a039b937649a93341615f531358e (diff)
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 'drivers/base')
-rw-r--r--drivers/base/dd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 7e9219b02796..e3a3eff1dacc 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -413,17 +413,16 @@ void *dev_get_drvdata(const struct device *dev)
413} 413}
414EXPORT_SYMBOL(dev_get_drvdata); 414EXPORT_SYMBOL(dev_get_drvdata);
415 415
416void dev_set_drvdata(struct device *dev, void *data) 416int dev_set_drvdata(struct device *dev, void *data)
417{ 417{
418 int error; 418 int error;
419 419
420 if (!dev)
421 return;
422 if (!dev->p) { 420 if (!dev->p) {
423 error = device_private_init(dev); 421 error = device_private_init(dev);
424 if (error) 422 if (error)
425 return; 423 return error;
426 } 424 }
427 dev->p->driver_data = data; 425 dev->p->driver_data = data;
426 return 0;
428} 427}
429EXPORT_SYMBOL(dev_set_drvdata); 428EXPORT_SYMBOL(dev_set_drvdata);