Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355348
b: refs/heads/master
c: 40ee6fc
h: refs/heads/master
v: v3
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Jan 25, 2013
1 parent 4494747 commit c04a33d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 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: 4aeacd5bd5c354c1b36bfe3d5d72806ecd9605a0
refs/heads/master: 40ee6fce7a0d3a2b2a1f2a14900af98a49a9ff40
15 changes: 6 additions & 9 deletions trunk/drivers/sh/pfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -573,19 +573,16 @@ static struct platform_device sh_pfc_device = {

int __init register_sh_pfc(struct sh_pfc_platform_data *pdata)
{
int rc;

sh_pfc_device.dev.platform_data = pdata;

rc = platform_driver_register(&sh_pfc_driver);
if (likely(!rc)) {
rc = platform_device_register(&sh_pfc_device);
if (unlikely(rc))
platform_driver_unregister(&sh_pfc_driver);
}
return platform_device_register(&sh_pfc_device);
}

return rc;
static int __init sh_pfc_init(void)
{
return platform_driver_register(&sh_pfc_driver);
}
postcore_initcall(sh_pfc_init);

static void __exit sh_pfc_exit(void)
{
Expand Down

0 comments on commit c04a33d

Please sign in to comment.