Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66082
b: refs/heads/master
c: ed155a9
h: refs/heads/master
v: v3
  • Loading branch information
Grant Likely authored and Jens Axboe committed Oct 10, 2007
1 parent 86091b4 commit be4a0bc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 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: 95e896c35f3c3157159b89682b60281640b5d148
refs/heads/master: ed155a95a4eb7d8dae61b64ab394314c5195e414
20 changes: 10 additions & 10 deletions trunk/drivers/block/xsysace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,13 +1034,13 @@ static int __devinit ace_setup(struct ace_device *ace)

return 0;

err_read:
err_read:
put_disk(ace->gd);
err_alloc_disk:
err_alloc_disk:
blk_cleanup_queue(ace->queue);
err_blk_initq:
err_blk_initq:
iounmap(ace->baseaddr);
err_ioremap:
err_ioremap:
dev_info(ace->dev, "xsysace: error initializing device at 0x%lx\n",
ace->physaddr);
return -ENOMEM;
Expand Down Expand Up @@ -1097,11 +1097,11 @@ ace_alloc(struct device *dev, int id, unsigned long physaddr,
dev_set_drvdata(dev, ace);
return 0;

err_setup:
err_setup:
dev_set_drvdata(dev, NULL);
kfree(ace);
err_alloc:
err_noreg:
err_alloc:
err_noreg:
dev_err(dev, "could not initialize device, err=%i\n", rc);
return rc;
}
Expand Down Expand Up @@ -1263,11 +1263,11 @@ static int __init ace_init(void)
pr_info("Xilinx SystemACE device driver, major=%i\n", ace_major);
return 0;

err_plat:
err_plat:
ace_of_unregister();
err_of:
err_of:
unregister_blkdev(ace_major, "xsysace");
err_blk:
err_blk:
printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc);
return rc;
}
Expand Down

0 comments on commit be4a0bc

Please sign in to comment.