diff options
Diffstat (limited to 'drivers/char/isicom.c')
-rw-r--r-- | drivers/char/isicom.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index 4159292e35cf..4f1f4cd670da 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
@@ -122,6 +122,7 @@ | |||
122 | #include <linux/fs.h> | 122 | #include <linux/fs.h> |
123 | #include <linux/sched.h> | 123 | #include <linux/sched.h> |
124 | #include <linux/serial.h> | 124 | #include <linux/serial.h> |
125 | #include <linux/smp_lock.h> | ||
125 | #include <linux/mm.h> | 126 | #include <linux/mm.h> |
126 | #include <linux/interrupt.h> | 127 | #include <linux/interrupt.h> |
127 | #include <linux/timer.h> | 128 | #include <linux/timer.h> |
@@ -1478,10 +1479,10 @@ static int __devinit load_firmware(struct pci_dev *pdev, | |||
1478 | status = inw(base + 0x4); | 1479 | status = inw(base + 0x4); |
1479 | if (status != 0) { | 1480 | if (status != 0) { |
1480 | dev_warn(&pdev->dev, "Card%d rejected load header:\n" | 1481 | dev_warn(&pdev->dev, "Card%d rejected load header:\n" |
1481 | KERN_WARNING "Address:0x%x\n" | 1482 | "Address:0x%x\n" |
1482 | KERN_WARNING "Count:0x%x\n" | 1483 | "Count:0x%x\n" |
1483 | KERN_WARNING "Status:0x%x\n", | 1484 | "Status:0x%x\n", |
1484 | index + 1, frame->addr, frame->count, status); | 1485 | index + 1, frame->addr, frame->count, status); |
1485 | goto errrelfw; | 1486 | goto errrelfw; |
1486 | } | 1487 | } |
1487 | outsw(base, frame->data, word_count); | 1488 | outsw(base, frame->data, word_count); |
@@ -1526,10 +1527,10 @@ static int __devinit load_firmware(struct pci_dev *pdev, | |||
1526 | status = inw(base + 0x4); | 1527 | status = inw(base + 0x4); |
1527 | if (status != 0) { | 1528 | if (status != 0) { |
1528 | dev_warn(&pdev->dev, "Card%d rejected verify header:\n" | 1529 | dev_warn(&pdev->dev, "Card%d rejected verify header:\n" |
1529 | KERN_WARNING "Address:0x%x\n" | 1530 | "Address:0x%x\n" |
1530 | KERN_WARNING "Count:0x%x\n" | 1531 | "Count:0x%x\n" |
1531 | KERN_WARNING "Status: 0x%x\n", | 1532 | "Status: 0x%x\n", |
1532 | index + 1, frame->addr, frame->count, status); | 1533 | index + 1, frame->addr, frame->count, status); |
1533 | goto errrelfw; | 1534 | goto errrelfw; |
1534 | } | 1535 | } |
1535 | 1536 | ||