aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/xsysace.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/xsysace.c')
-rw-r--r--drivers/block/xsysace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index fb1975d82a73..1a17e338735e 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -456,7 +456,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace)
456{ 456{
457 dev_dbg(ace->dev, "ace_fsm_yieldirq()\n"); 457 dev_dbg(ace->dev, "ace_fsm_yieldirq()\n");
458 458
459 if (ace->irq == NO_IRQ) 459 if (!ace->irq)
460 /* No IRQ assigned, so need to poll */ 460 /* No IRQ assigned, so need to poll */
461 tasklet_schedule(&ace->fsm_tasklet); 461 tasklet_schedule(&ace->fsm_tasklet);
462 ace->fsm_continue_flag = 0; 462 ace->fsm_continue_flag = 0;
@@ -1034,12 +1034,12 @@ static int __devinit ace_setup(struct ace_device *ace)
1034 ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ); 1034 ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ);
1035 1035
1036 /* Now we can hook up the irq handler */ 1036 /* Now we can hook up the irq handler */
1037 if (ace->irq != NO_IRQ) { 1037 if (ace->irq) {
1038 rc = request_irq(ace->irq, ace_interrupt, 0, "systemace", ace); 1038 rc = request_irq(ace->irq, ace_interrupt, 0, "systemace", ace);
1039 if (rc) { 1039 if (rc) {
1040 /* Failure - fall back to polled mode */ 1040 /* Failure - fall back to polled mode */
1041 dev_err(ace->dev, "request_irq failed\n"); 1041 dev_err(ace->dev, "request_irq failed\n");
1042 ace->irq = NO_IRQ; 1042 ace->irq = 0;
1043 } 1043 }
1044 } 1044 }
1045 1045
@@ -1086,7 +1086,7 @@ static void __devexit ace_teardown(struct ace_device *ace)
1086 1086
1087 tasklet_kill(&ace->fsm_tasklet); 1087 tasklet_kill(&ace->fsm_tasklet);
1088 1088
1089 if (ace->irq != NO_IRQ) 1089 if (ace->irq)
1090 free_irq(ace->irq, ace); 1090 free_irq(ace->irq, ace);
1091 1091
1092 iounmap(ace->baseaddr); 1092 iounmap(ace->baseaddr);
@@ -1156,7 +1156,7 @@ static int __devinit ace_probe(struct platform_device *dev)
1156 resource_size_t physaddr = 0; 1156 resource_size_t physaddr = 0;
1157 int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */ 1157 int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */
1158 u32 id = dev->id; 1158 u32 id = dev->id;
1159 int irq = NO_IRQ; 1159 int irq = 0;
1160 int i; 1160 int i;
1161 1161
1162 dev_dbg(&dev->dev, "ace_probe(%p)\n", dev); 1162 dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);