Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66088
b: refs/heads/master
c: 34e1b83
h: refs/heads/master
v: v3
  • Loading branch information
Grant Likely authored and Jens Axboe committed Oct 10, 2007
1 parent 486787f commit 9551bdf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 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: cb3503ca54dc34e8dc3b823a6bd52c0807c102f4
refs/heads/master: 34e1b83413d91999416443f31c276095f9937aa6
9 changes: 6 additions & 3 deletions trunk/drivers/block/xsysace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,8 @@ ace_alloc(struct device *dev, int id, unsigned long physaddr,
ace->bus_width = bus_width;

/* Call the setup code */
if ((rc = ace_setup(ace)) != 0)
rc = ace_setup(ace);
if (rc)
goto err_setup;

dev_set_drvdata(dev, ace);
Expand Down Expand Up @@ -1253,11 +1254,13 @@ static int __init ace_init(void)
goto err_blk;
}

if ((rc = ace_of_register()) != 0)
rc = ace_of_register();
if (rc)
goto err_of;

pr_debug("xsysace: registering platform binding\n");
if ((rc = platform_driver_register(&ace_platform_driver)) != 0)
rc = platform_driver_register(&ace_platform_driver);
if (rc)
goto err_plat;

pr_info("Xilinx SystemACE device driver, major=%i\n", ace_major);
Expand Down

0 comments on commit 9551bdf

Please sign in to comment.