diff options
Diffstat (limited to 'drivers/misc/tifm_7xx1.c')
-rw-r--r-- | drivers/misc/tifm_7xx1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index 375b56742f2b..7fbf5d58bfc5 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c | |||
@@ -71,6 +71,7 @@ static void tifm_7xx1_remove_media(struct work_struct *work) | |||
71 | static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id) | 71 | static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id) |
72 | { | 72 | { |
73 | struct tifm_adapter *fm = dev_id; | 73 | struct tifm_adapter *fm = dev_id; |
74 | struct tifm_dev *sock; | ||
74 | unsigned int irq_status; | 75 | unsigned int irq_status; |
75 | unsigned int sock_irq_status, cnt; | 76 | unsigned int sock_irq_status, cnt; |
76 | 77 | ||
@@ -85,15 +86,13 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id) | |||
85 | writel(TIFM_IRQ_ENABLE, fm->addr + FM_CLEAR_INTERRUPT_ENABLE); | 86 | writel(TIFM_IRQ_ENABLE, fm->addr + FM_CLEAR_INTERRUPT_ENABLE); |
86 | 87 | ||
87 | for (cnt = 0; cnt < fm->max_sockets; cnt++) { | 88 | for (cnt = 0; cnt < fm->max_sockets; cnt++) { |
89 | sock = fm->sockets[cnt]; | ||
88 | sock_irq_status = (irq_status >> cnt) & | 90 | sock_irq_status = (irq_status >> cnt) & |
89 | (TIFM_IRQ_FIFOMASK | TIFM_IRQ_CARDMASK); | 91 | (TIFM_IRQ_FIFOMASK | TIFM_IRQ_CARDMASK); |
90 | 92 | ||
91 | if (fm->sockets[cnt]) { | 93 | if (sock) { |
92 | if (sock_irq_status && | 94 | if (sock_irq_status) |
93 | fm->sockets[cnt]->signal_irq) | 95 | sock->signal_irq(sock, sock_irq_status); |
94 | fm->sockets[cnt]-> | ||
95 | signal_irq(fm->sockets[cnt], | ||
96 | sock_irq_status); | ||
97 | 96 | ||
98 | if (irq_status & (1 << cnt)) | 97 | if (irq_status & (1 << cnt)) |
99 | fm->remove_mask |= 1 << cnt; | 98 | fm->remove_mask |= 1 << cnt; |