From 8e55209f33625c5d919b6e0a7e54d3caa5842eeb Mon Sep 17 00:00:00 2001
From: Jeremy Drake <jeremy@drastrom.science>
Date: Mon, 7 Oct 2019 16:04:14 +0900
Subject: [PATCH] Fix USB driver.

---
 ChangeLog           | 5 +++++
 mcu/usb-st-common.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9dad21b..65826e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-07  Jeremy Drake  <jeremy@drastrom.science>
+
+	* mcu/usb-st-common.c (usb_lld_init): Move BTABLE initialization
+	after clearing ISTR register.
+
 2019-09-04  NIIBE Yutaka  <gniibe@fsij.org>
 
 	When it was exactly 64-byte, two ZLPs were sent wrongly.
diff --git a/mcu/usb-st-common.c b/mcu/usb-st-common.c
index b97df38..58fe4fc 100644
--- a/mcu/usb-st-common.c
+++ b/mcu/usb-st-common.c
@@ -235,10 +235,9 @@ usb_lld_init (struct usb_dev *dev, uint8_t feature)
   USB->CNTR = CNTR_FRES;
   USB->CNTR = 0;
 
-  USB->BTABLE = 0;
-
   /* Clear Interrupt Status Register, and enable interrupt for USB */
   USB->ISTR = 0;
+  USB->BTABLE = 0;
   USB->CNTR = (CNTR_CTRM | CNTR_OVRM | CNTR_ERRM
 	       | CNTR_WKUPM | CNTR_SUSPM | CNTR_RESETM);
 }