[SeaBIOS] [PATCH] USB-EHCI: Fix null pointer assignment
Avik Sil
aviksil at linux.vnet.ibm.com
Thu Feb 14 06:24:57 CET 2013
cntl->regs should not be accessed before initializing it.
Signed-off-by: Avik Sil <aviksil at linux.vnet.ibm.com>
---
src/usb-ehci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/usb-ehci.c b/src/usb-ehci.c
index f28f343..69a9194 100644
--- a/src/usb-ehci.c
+++ b/src/usb-ehci.c
@@ -347,9 +347,9 @@ ehci_setup(struct pci_device *pci, int busid, struct pci_device *comppci)
cntl->usb.pci = pci;
cntl->usb.type = USB_TYPE_EHCI;
cntl->caps = caps;
+ cntl->regs = (void*)caps + readb(&caps->caplength);
if (hcc_params & HCC_64BIT_ADDR)
cntl->regs->ctrldssegment = 0;
- cntl->regs = (void*)caps + readb(&caps->caplength);
dprintf(1, "EHCI init on dev %02x:%02x.%x (regs=%p)\n"
, pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf)
--
1.7.11.7
More information about the SeaBIOS
mailing list