diff --git a/[refs] b/[refs] index d8cc1015257b..e05cc96e8c4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f803f0d079ded4272d7a1c9813bfd24c58b8ee5f +refs/heads/master: 076c7265488cc4016c6502f3f9d8dbf1e97fd147 diff --git a/trunk/drivers/rtc/rtc-s3c.c b/trunk/drivers/rtc/rtc-s3c.c index a7a2a998fa91..d9da51193bc3 100644 --- a/trunk/drivers/rtc/rtc-s3c.c +++ b/trunk/drivers/rtc/rtc-s3c.c @@ -501,8 +501,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) if (s3c_rtc_mem == NULL) { dev_err(&pdev->dev, "failed to reserve memory region\n"); - ret = -ENOENT; - goto err_nores; + return -ENOENT; } s3c_rtc_base = ioremap(res->start, resource_size(res)); @@ -612,8 +611,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) err_nomap: release_resource(s3c_rtc_mem); - - err_nores: return ret; }