aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/xsysace.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 56c4af3c2edb..3ea172b7b7a4 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1034,13 +1034,13 @@ static int __devinit ace_setup(struct ace_device *ace)
1034 1034
1035 return 0; 1035 return 0;
1036 1036
1037 err_read: 1037err_read:
1038 put_disk(ace->gd); 1038 put_disk(ace->gd);
1039 err_alloc_disk: 1039err_alloc_disk:
1040 blk_cleanup_queue(ace->queue); 1040 blk_cleanup_queue(ace->queue);
1041 err_blk_initq: 1041err_blk_initq:
1042 iounmap(ace->baseaddr); 1042 iounmap(ace->baseaddr);
1043 err_ioremap: 1043err_ioremap:
1044 dev_info(ace->dev, "xsysace: error initializing device at 0x%lx\n", 1044 dev_info(ace->dev, "xsysace: error initializing device at 0x%lx\n",
1045 ace->physaddr); 1045 ace->physaddr);
1046 return -ENOMEM; 1046 return -ENOMEM;
@@ -1097,11 +1097,11 @@ ace_alloc(struct device *dev, int id, unsigned long physaddr,
1097 dev_set_drvdata(dev, ace); 1097 dev_set_drvdata(dev, ace);
1098 return 0; 1098 return 0;
1099 1099
1100 err_setup: 1100err_setup:
1101 dev_set_drvdata(dev, NULL); 1101 dev_set_drvdata(dev, NULL);
1102 kfree(ace); 1102 kfree(ace);
1103 err_alloc: 1103err_alloc:
1104 err_noreg: 1104err_noreg:
1105 dev_err(dev, "could not initialize device, err=%i\n", rc); 1105 dev_err(dev, "could not initialize device, err=%i\n", rc);
1106 return rc; 1106 return rc;
1107} 1107}
@@ -1263,11 +1263,11 @@ static int __init ace_init(void)
1263 pr_info("Xilinx SystemACE device driver, major=%i\n", ace_major); 1263 pr_info("Xilinx SystemACE device driver, major=%i\n", ace_major);
1264 return 0; 1264 return 0;
1265 1265
1266 err_plat: 1266err_plat:
1267 ace_of_unregister(); 1267 ace_of_unregister();
1268 err_of: 1268err_of:
1269 unregister_blkdev(ace_major, "xsysace"); 1269 unregister_blkdev(ace_major, "xsysace");
1270 err_blk: 1270err_blk:
1271 printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc); 1271 printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc);
1272 return rc; 1272 return rc;
1273} 1273}