summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Goode <emilgoode@gmail.com>2012-07-30 14:42:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 17:25:21 -0700
commit668f06b9fb846ecedb73964ca5dd95ce441707be (patch)
tree973d6e63af978ae1fdafdf6ec273cafaf0a2eb35
parent25353b3377d5a75d4b830477bb90a3691155de72 (diff)
downloadlinux-stable-668f06b9fb846ecedb73964ca5dd95ce441707be.tar.gz
linux-stable-668f06b9fb846ecedb73964ca5dd95ce441707be.tar.bz2
linux-stable-668f06b9fb846ecedb73964ca5dd95ce441707be.zip
pps: return PTR_ERR on error in device_create
We should return PTR_ERR if the call to the device_create function fails. Without this patch we instead return the value from a successful call to cdev_add if the call to device_create fails. Signed-off-by: Emil Goode <emilgoode@gmail.com> Acked-by: Devendra Naga <devendra.aaru@gmail.com> Cc: Alexander Gordeev <lasaine@lvk.cs.msu.su> Cc: Rodolfo Giometti <giometti@enneenne.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/pps/pps.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index 98fbe62694d4..e771487132f7 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -327,8 +327,10 @@ int pps_register_cdev(struct pps_device *pps)
}
pps->dev = device_create(pps_class, pps->info.dev, devt, pps,
"pps%d", pps->id);
- if (IS_ERR(pps->dev))
+ if (IS_ERR(pps->dev)) {
+ err = PTR_ERR(pps->dev);
goto del_cdev;
+ }
pps->dev->release = pps_device_destruct;