diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 16:29:08 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 16:29:08 +1100 |
| commit | c088f4e9da74b901f7ed1749ad697d77622ed0f9 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /drivers/video/backlight/progear_bl.c | |
| parent | ce79735c12d62c3cda38eb31762cf98e87c7b087 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
| download | talos-op-linux-c088f4e9da74b901f7ed1749ad697d77622ed0f9.tar.gz talos-op-linux-c088f4e9da74b901f7ed1749ad697d77622ed0f9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/backlight/progear_bl.c')
| -rw-r--r-- | drivers/video/backlight/progear_bl.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c index 15fb4d58b5bc..9edaf24fd82d 100644 --- a/drivers/video/backlight/progear_bl.c +++ b/drivers/video/backlight/progear_bl.c @@ -119,20 +119,16 @@ static int __init progearbl_init(void) { int ret = platform_driver_register(&progearbl_driver); - if (!ret) { - progearbl_device = platform_device_alloc("progear-bl", -1); - if (!progearbl_device) - return -ENOMEM; - - ret = platform_device_add(progearbl_device); - - if (ret) { - platform_device_put(progearbl_device); - platform_driver_unregister(&progearbl_driver); - } + if (ret) + return ret; + progearbl_device = platform_device_register_simple("progear-bl", -1, + NULL, 0); + if (IS_ERR(progearbl_device)) { + platform_driver_unregister(&progearbl_driver); + return PTR_ERR(progearbl_device); } - return ret; + return 0; } static void __exit progearbl_exit(void) |
