diff options
Diffstat (limited to 'drivers/char/pcmcia/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 279ff5005cec..4e84d233e5a2 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -1225,17 +1225,15 @@ static void ri_change(MGSLPC_INFO *info) | |||
1225 | * irq interrupt number that caused interrupt | 1225 | * irq interrupt number that caused interrupt |
1226 | * dev_id device ID supplied during interrupt registration | 1226 | * dev_id device ID supplied during interrupt registration |
1227 | */ | 1227 | */ |
1228 | static irqreturn_t mgslpc_isr(int irq, void *dev_id) | 1228 | static irqreturn_t mgslpc_isr(int dummy, void *dev_id) |
1229 | { | 1229 | { |
1230 | MGSLPC_INFO * info = (MGSLPC_INFO *)dev_id; | 1230 | MGSLPC_INFO *info = dev_id; |
1231 | unsigned short isr; | 1231 | unsigned short isr; |
1232 | unsigned char gis, pis; | 1232 | unsigned char gis, pis; |
1233 | int count=0; | 1233 | int count=0; |
1234 | 1234 | ||
1235 | if (debug_level >= DEBUG_LEVEL_ISR) | 1235 | if (debug_level >= DEBUG_LEVEL_ISR) |
1236 | printk("mgslpc_isr(%d) entry.\n", irq); | 1236 | printk("mgslpc_isr(%d) entry.\n", info->irq_level); |
1237 | if (!info) | ||
1238 | return IRQ_NONE; | ||
1239 | 1237 | ||
1240 | if (!(info->p_dev->_locked)) | 1238 | if (!(info->p_dev->_locked)) |
1241 | return IRQ_HANDLED; | 1239 | return IRQ_HANDLED; |
@@ -1327,7 +1325,7 @@ static irqreturn_t mgslpc_isr(int irq, void *dev_id) | |||
1327 | 1325 | ||
1328 | if (debug_level >= DEBUG_LEVEL_ISR) | 1326 | if (debug_level >= DEBUG_LEVEL_ISR) |
1329 | printk("%s(%d):mgslpc_isr(%d)exit.\n", | 1327 | printk("%s(%d):mgslpc_isr(%d)exit.\n", |
1330 | __FILE__,__LINE__,irq); | 1328 | __FILE__, __LINE__, info->irq_level); |
1331 | 1329 | ||
1332 | return IRQ_HANDLED; | 1330 | return IRQ_HANDLED; |
1333 | } | 1331 | } |