aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx88/cx88-core.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index f31ec96924b..055264b9cd6 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -1077,8 +1077,11 @@ static int get_ressources(struct cx88_core *core, struct pci_dev *pci)
1077 pci_resource_len(pci,0), 1077 pci_resource_len(pci,0),
1078 core->name)) 1078 core->name))
1079 return 0; 1079 return 0;
1080 printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n", 1080 printk(KERN_ERR
1081 core->name,(unsigned long long)pci_resource_start(pci,0)); 1081 "%s/%d: Can't get MMIO memory @ 0x%llx, subsystem: %04x:%04x\n",
1082 core->name, PCI_FUNC(pci->devfn),
1083 (unsigned long long)pci_resource_start(pci, 0),
1084 pci->subsystem_vendor, pci->subsystem_device);
1082 return -EBUSY; 1085 return -EBUSY;
1083} 1086}
1084 1087
@@ -1115,12 +1118,6 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
1115 core->nr = cx88_devcount++; 1118 core->nr = cx88_devcount++;
1116 sprintf(core->name,"cx88[%d]",core->nr); 1119 sprintf(core->name,"cx88[%d]",core->nr);
1117 if (0 != get_ressources(core,pci)) { 1120 if (0 != get_ressources(core,pci)) {
1118 printk(KERN_ERR "CORE %s No more PCI ressources for "
1119 "subsystem: %04x:%04x, board: %s\n",
1120 core->name,pci->subsystem_vendor,
1121 pci->subsystem_device,
1122 cx88_boards[core->board].name);
1123
1124 cx88_devcount--; 1121 cx88_devcount--;
1125 goto fail_free; 1122 goto fail_free;
1126 } 1123 }