From: Avik Sil <aviksil@linux.vnet.ibm.com>
Date: Thu, 14 Feb 2013 05:24:57 +0000 (+0530)
Subject: USB-EHCI: Fix null pointer assignment
X-Git-Tag: rel-1.7.3~94
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7cac600a661bf664553726b0729916f5485a310b;p=seabios.git

USB-EHCI: Fix null pointer assignment

cntl->regs should not be accessed before initializing it.

Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>
---

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)