Fix merge

Author: Gordon Hollingworth

drivers/usb/host/dwc_otg/dwc_otg_hcd.c

@@ -1373,13 +1373,13 @@ static void process_periodic_channels(dwc_otg_hcd_t * hcd)
 	int no_queue_space = 0;
 	int no_fifo_space = 0;
 
+	dwc_otg_host_global_regs_t *host_regs;
+	host_regs = hcd->core_if->host_if->host_global_regs;
+
 // OK This is not being called on the right frame, even though we do get every SOF interrupt, need to see if it is
 // not actually in the assigned queue at the right time...
 info_data(info_process_periodic);
 
-	dwc_otg_host_global_regs_t *host_regs;
-	host_regs = hcd->core_if->host_if->host_global_regs;
-
 	DWC_DEBUGPL(DBG_HCDV, "Queue periodic transactions\n");
 #ifdef DEBUG
 	tx_status.d32 = DWC_READ_REG32(&host_regs->hptxsts);

drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c

@@ -199,6 +199,7 @@ int32_t dwc_otg_hcd_handle_sof_intr(dwc_otg_hcd_t * hcd)
 	dwc_list_link_t *qh_entry;
 	dwc_otg_qh_t *qh;
 	dwc_otg_transaction_type_e tr_type;
+	int next_sched;
 	gintsts_data_t gintsts = {.d32 = 0 };
 
 	hfnum.d32 =