vgabios: Framebuffer fixes for CGA and planar graphics modes.

[seabios.git] / src / usb-ohci.c

diff --git a/src/usb-ohci.c b/src/usb-ohci.c
index 72b9f68b7f50f3b40cd0ca7af9d5d4855f340022..9107db2bcd2af68e76fc7ceb9656d7dd4d1c73c6 100644 (file)
--- a/src/usb-ohci.c
+++ b/src/usb-ohci.c
@@ -204,16 +204,21 @@ free:
 }
 
 void
-ohci_init(u16 bdf, int busid)
+ohci_init(struct pci_device *pci, int busid)
 {
     if (! CONFIG_USB_OHCI)
         return;
     struct usb_ohci_s *cntl = malloc_tmphigh(sizeof(*cntl));
+    if (!cntl) {
+        warn_noalloc();
+        return;
+    }
     memset(cntl, 0, sizeof(*cntl));
     cntl->usb.busid = busid;
-    cntl->usb.bdf = bdf;
+    cntl->usb.pci = pci;
     cntl->usb.type = USB_TYPE_OHCI;
 
+    u16 bdf = pci->bdf;
     u32 baseaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0);
     cntl->regs = (void*)(baseaddr & PCI_BASE_ADDRESS_MEM_MASK);