diff --git a/src/chipset/stpc.c b/src/chipset/stpc.c
index 5efe9eb6a..a4dc8df96 100644
--- a/src/chipset/stpc.c
+++ b/src/chipset/stpc.c
@@ -524,10 +524,6 @@ stpc_setup(stpc_t *dev)
 {
     stpc_log("STPC: setup()\n");
 
-    uint32_t local = dev->local;
-    memset(dev, 0, sizeof(stpc_t));
-    dev->local = local;
-
     /* Northbridge */
     dev->pci_conf[0][0x00] = 0x4a;
     dev->pci_conf[0][0x01] = 0x10;
@@ -605,7 +601,7 @@ stpc_setup(stpc_t *dev)
     dev->pci_conf[2][0x47] = 0x97;
 
     /* USB */
-    if (dev->local & STPC_USB) {
+    if (dev->usb) {
     	dev->pci_conf[3][0x00] = 0x4a;
     	dev->pci_conf[3][0x01] = 0x10;
     	dev->pci_conf[3][0x02] = 0x30;
@@ -640,6 +636,8 @@ stpc_init(const device_t *info)
     stpc_log("STPC: init()\n");
 
     stpc_t *dev = (stpc_t *) malloc(sizeof(stpc_t));
+    memset(dev, 0, sizeof(stpc_t));
+    
     dev->local = info->local;
 
     pci_add_card(0x0B, stpc_nb_read, stpc_nb_write, dev);