summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2009-08-02 15:26:51 +0200
committerHelge Deller <deller@gmx.de>2009-08-02 15:26:51 +0200
commit1a1dba32412c15c51d5fc0b9efadd2ea310356d7 (patch)
treec8477fd7099fa57b216d1bbc68475fe21b757dd1
parent1e0deabd35f210f22c03cc734a0335c07ae71ff3 (diff)
parisc: sticore.c - check return values
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--drivers/video/console/sticore.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index ef7870f5ea0..857b3668b3b 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -957,9 +957,14 @@ static int __devinit sticore_pci_init(struct pci_dev *pd,
#ifdef CONFIG_PCI
unsigned long fb_base, rom_base;
unsigned int fb_len, rom_len;
+ int err;
struct sti_struct *sti;
- pci_enable_device(pd);
+ err = pci_enable_device(pd);
+ if (err < 0) {
+ dev_err(&pd->dev, "Cannot enable PCI device\n");
+ return err;
+ }
fb_base = pci_resource_start(pd, 0);
fb_len = pci_resource_len(pd, 0);
@@ -1048,7 +1053,7 @@ static void __devinit sti_init_roms(void)
/* Register drivers for native & PCI cards */
register_parisc_driver(&pa_sti_driver);
- pci_register_driver(&pci_sti_driver);
+ WARN_ON(pci_register_driver(&pci_sti_driver));
/* if we didn't find the given default sti, take the first one */
if (!default_sti)