drivers/video/backlight/lcd.c: call put_device if device_register fails

levex · torvalds · commit 54f5968db9e0 · 2014-01-30T16:56:54.000-08:00
Currently we kfree the container of the device which failed to register.
This is wrong as the last reference is not given up with a put_device
call.  Also, now that we have put_device() callen, we no longer need the
kfree as the new_ld-&gt;dev.release function will take care of kfreeing the
associated memory.

Signed-off-by: Levente Kurusa &lt;levex@linux.com&gt;
Acked-by: Jingoo Han &lt;jg1.han@samsung.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
@@ -228,7 +228,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent,
 
 	rc = device_register(&new_ld->dev);
 	if (rc) {
-		kfree(new_ld);
+		put_device(&new_ld->dev);
 		return ERR_PTR(rc);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ struct lcd_device lcd_device_register(const char name, struct device *parent,`
`228`	`228`
`229`	`229`	`rc = device_register(&new_ld->dev);`
`230`	`230`	`if (rc) {`
`231`		`- kfree(new_ld);`
	`231`	`+ put_device(&new_ld->dev);`
`232`	`232`	`return ERR_PTR(rc);`
`233`	`233`	`}`
`234`	`234`