projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/usb-caiaq' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
parisc
/
superio.c
diff --git
a/drivers/parisc/superio.c
b/drivers/parisc/superio.c
index 38cdf9fa36a7b8f20e5f57976220e4b5101e21a3..1e93c837514f11fdf065ce80703ba57651276a2f 100644
(file)
--- a/
drivers/parisc/superio.c
+++ b/
drivers/parisc/superio.c
@@
-155,6
+155,7
@@
superio_init(struct pci_dev *pcidev)
struct superio_device *sio = &sio_dev;
struct pci_dev *pdev = sio->lio_pdev;
u16 word;
struct superio_device *sio = &sio_dev;
struct pci_dev *pdev = sio->lio_pdev;
u16 word;
+ int ret;
if (sio->suckyio_irq_enabled)
return;
if (sio->suckyio_irq_enabled)
return;
@@
-200,7
+201,8
@@
superio_init(struct pci_dev *pcidev)
pci_write_config_word (pdev, PCI_COMMAND, word);
pci_set_master (pdev);
pci_write_config_word (pdev, PCI_COMMAND, word);
pci_set_master (pdev);
- pci_enable_device(pdev);
+ ret = pci_enable_device(pdev);
+ BUG_ON(ret < 0); /* not too much we can do about this... */
/*
* Next project is programming the onboard interrupt controllers.
/*
* Next project is programming the onboard interrupt controllers.
@@
-361,7
+363,9
@@
int superio_fixup_irq(struct pci_dev *pcidev)
#endif
for (i = 0; i < 16; i++) {
#endif
for (i = 0; i < 16; i++) {
- irq_desc[i].chip = &superio_interrupt_type;
+ struct irq_desc *desc = irq_to_desc(i);
+
+ desc->chip = &superio_interrupt_type;
}
/*
}
/*