diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2006-11-25 14:09:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-25 16:28:34 -0500 |
| commit | 5e66b0b5f187c811419ff10cfb5668c028a64d57 (patch) | |
| tree | ae387b8f938272ad6fbee48b5794644c9da2e14c | |
| parent | 753ca4f312a4b26940e4731b4fa5dbbbbcc77e97 (diff) | |
[PATCH] tlclk: fix platform_device_register_simple() error check
The return value of platform_device_register_simple() should be checked by
IS_ERR().
This patch also fix misc_register() error case. Because misc_register()
returns error code.
Cc: Sebastien Bouchard <sebastien.bouchard@ca.kontron.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/char/tlclk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index 2444a0e24b31..244d30a03fef 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c | |||
| @@ -792,15 +792,14 @@ static int __init tlclk_init(void) | |||
| 792 | ret = misc_register(&tlclk_miscdev); | 792 | ret = misc_register(&tlclk_miscdev); |
| 793 | if (ret < 0) { | 793 | if (ret < 0) { |
| 794 | printk(KERN_ERR "tlclk: misc_register returns %d.\n", ret); | 794 | printk(KERN_ERR "tlclk: misc_register returns %d.\n", ret); |
| 795 | ret = -EBUSY; | ||
| 796 | goto out3; | 795 | goto out3; |
| 797 | } | 796 | } |
| 798 | 797 | ||
| 799 | tlclk_device = platform_device_register_simple("telco_clock", | 798 | tlclk_device = platform_device_register_simple("telco_clock", |
| 800 | -1, NULL, 0); | 799 | -1, NULL, 0); |
| 801 | if (!tlclk_device) { | 800 | if (IS_ERR(tlclk_device)) { |
| 802 | printk(KERN_ERR "tlclk: platform_device_register failed.\n"); | 801 | printk(KERN_ERR "tlclk: platform_device_register failed.\n"); |
| 803 | ret = -EBUSY; | 802 | ret = PTR_ERR(tlclk_device); |
| 804 | goto out4; | 803 | goto out4; |
| 805 | } | 804 | } |
| 806 | 805 | ||
