diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-07 14:58:09 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-11-07 14:58:09 +0900 |
| commit | 29dd0dae507f73f305aaea765f975eafd1fa5493 (patch) | |
| tree | 9ce766a017cbf18a408f8341c4c1e24a2d711aaa /drivers/rtc/rtc-sh.c | |
| parent | 9c88b6ba1c72a8bba30347b63f1531f2d9c2a309 (diff) | |
| download | lwn-29dd0dae507f73f305aaea765f975eafd1fa5493.tar.gz lwn-29dd0dae507f73f305aaea765f975eafd1fa5493.zip | |
rtc: sh-rtc: Handle rtc_device_register() failure properly.
Currently if rtc_device_register() fails we have an IS_ERR() on
the wrong pointer, which causes this to always be skipped. Fix
this up to actually check the right pointer. The return value
was always correct, even though the check was wrong.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/rtc/rtc-sh.c')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 78277a118b67..61caed506c31 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -588,7 +588,7 @@ static int __devinit sh_rtc_probe(struct platform_device *pdev) rtc->rtc_dev = rtc_device_register("sh", &pdev->dev, &sh_rtc_ops, THIS_MODULE); - if (IS_ERR(rtc)) { + if (IS_ERR(rtc->rtc_dev)) { ret = PTR_ERR(rtc->rtc_dev); goto err_badmap; } |