Commit 668f06b9 authored Jul 30, 2012 by Emil Goode Committed by Linus Torvalds Jul 30, 2012

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>

parent 25353b33

drivers/pps/pps.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;