diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 08:52:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-10 08:52:35 -0700 |
| commit | edf2377c4776ce20ae990f27f0248e88a37e25c4 (patch) | |
| tree | 2072ff0353aac87a46fdd0e79fb6a3e666720ee0 /drivers/video/backlight/backlight.c | |
| parent | 39de65aa2c3eee901db020a4f1396998e09602a3 (diff) | |
| parent | f1740e4cffede3e919a3511bf4e5113d642f09ec (diff) | |
Merge tag 'backlight-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight changes from Lee Jones:
- core: call put_device() instead of kfree()
- gpio-backlight: add DT support
- lm3639_bl driver: use managed resources
* tag 'backlight-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight: lm3639: Use devm_backlight_device_register()
backlight: gpio-backlight: Add DT support
backlight: core: Replace kfree with put_device
Diffstat (limited to 'drivers/video/backlight/backlight.c')
| -rw-r--r-- | drivers/video/backlight/backlight.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index 27d3cf255e7..bd2172c2d65 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -347,7 +347,7 @@ struct backlight_device *backlight_device_register(const char *name, rc = device_register(&new_bd->dev); if (rc) { - kfree(new_bd); + put_device(&new_bd->dev); return ERR_PTR(rc); } |