diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:41:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:41:56 -0400 |
| commit | 29c798fecb9b846b363b0a02fa662ff42fc19426 (patch) | |
| tree | e708d6aca8f098e69571780f702325b221b66694 /drivers/rtc/class.c | |
| parent | cb9906229595941d632fc4022b05da4f9533856a (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'drivers/rtc/class.c')
| -rw-r--r-- | drivers/rtc/class.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 565562ba6ac9..e6539cbabb35 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
| @@ -158,8 +158,10 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, | |||
| 158 | rtc_dev_prepare(rtc); | 158 | rtc_dev_prepare(rtc); |
| 159 | 159 | ||
| 160 | err = device_register(&rtc->dev); | 160 | err = device_register(&rtc->dev); |
| 161 | if (err) | 161 | if (err) { |
| 162 | put_device(&rtc->dev); | ||
| 162 | goto exit_kfree; | 163 | goto exit_kfree; |
| 164 | } | ||
| 163 | 165 | ||
| 164 | rtc_dev_add_device(rtc); | 166 | rtc_dev_add_device(rtc); |
| 165 | rtc_sysfs_add_device(rtc); | 167 | rtc_sysfs_add_device(rtc); |
