Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346443
b: refs/heads/master
c: 076c726
h: refs/heads/master
i:
  346441: fa3dcf1
  346439: 4d46f83
v: v3
  • Loading branch information
Tushar Behera authored and Linus Torvalds committed Dec 18, 2012
1 parent cc2636c commit 6147610
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f803f0d079ded4272d7a1c9813bfd24c58b8ee5f
refs/heads/master: 076c7265488cc4016c6502f3f9d8dbf1e97fd147
5 changes: 1 addition & 4 deletions trunk/drivers/rtc/rtc-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 6147610

Please sign in to comment.