diff options
Diffstat (limited to 'drivers/block/xsysace.c')
-rw-r--r-- | drivers/block/xsysace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 73354b081ed3..645ff765cd12 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
@@ -621,7 +621,7 @@ static void ace_fsm_dostate(struct ace_device *ace) | |||
621 | ace_dump_mem(ace->cf_id, 512); /* Debug: Dump out disk ID */ | 621 | ace_dump_mem(ace->cf_id, 512); /* Debug: Dump out disk ID */ |
622 | 622 | ||
623 | if (ace->data_result) { | 623 | if (ace->data_result) { |
624 | /* Error occured, disable the disk */ | 624 | /* Error occurred, disable the disk */ |
625 | ace->media_change = 1; | 625 | ace->media_change = 1; |
626 | set_capacity(ace->gd, 0); | 626 | set_capacity(ace->gd, 0); |
627 | dev_err(ace->dev, "error fetching CF id (%i)\n", | 627 | dev_err(ace->dev, "error fetching CF id (%i)\n", |
@@ -801,7 +801,7 @@ static int ace_interrupt_checkstate(struct ace_device *ace) | |||
801 | u32 sreg = ace_in32(ace, ACE_STATUS); | 801 | u32 sreg = ace_in32(ace, ACE_STATUS); |
802 | u16 creg = ace_in(ace, ACE_CTRL); | 802 | u16 creg = ace_in(ace, ACE_CTRL); |
803 | 803 | ||
804 | /* Check for error occurance */ | 804 | /* Check for error occurrence */ |
805 | if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) && | 805 | if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) && |
806 | (creg & ACE_CTRL_ERRORIRQ)) { | 806 | (creg & ACE_CTRL_ERRORIRQ)) { |
807 | dev_err(ace->dev, "transfer failure\n"); | 807 | dev_err(ace->dev, "transfer failure\n"); |
@@ -1169,7 +1169,7 @@ static int __devinit ace_probe(struct platform_device *dev) | |||
1169 | irq = dev->resource[i].start; | 1169 | irq = dev->resource[i].start; |
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | /* Call the bus-independant setup code */ | 1172 | /* Call the bus-independent setup code */ |
1173 | return ace_alloc(&dev->dev, id, physaddr, irq, bus_width); | 1173 | return ace_alloc(&dev->dev, id, physaddr, irq, bus_width); |
1174 | } | 1174 | } |
1175 | 1175 | ||
@@ -1222,7 +1222,7 @@ static int __devinit ace_of_probe(struct platform_device *op) | |||
1222 | if (of_find_property(op->dev.of_node, "8-bit", NULL)) | 1222 | if (of_find_property(op->dev.of_node, "8-bit", NULL)) |
1223 | bus_width = ACE_BUS_WIDTH_8; | 1223 | bus_width = ACE_BUS_WIDTH_8; |
1224 | 1224 | ||
1225 | /* Call the bus-independant setup code */ | 1225 | /* Call the bus-independent setup code */ |
1226 | return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0, | 1226 | return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0, |
1227 | physaddr, irq, bus_width); | 1227 | physaddr, irq, bus_width); |
1228 | } | 1228 | } |