2 files changed, 4 insertions, 2 deletions

diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile
index 8be8c39d49..74cc46bf44 100644
--- a/utils/MTP/beastpatcher/Makefile
+++ b/utils/MTP/beastpatcher/Makefile
@@ -10,12 +10,12 @@ OUTPUT=beastpatcher.exe
 CROSS=
 else
 OUTPUT=beastpatcher
-CROSS=i586-mingw32msvc-
+CROSS=i686-w64-mingw32-
 endif
 endif
 
 ifneq ($(findstring MINGW,$(shell uname)),MINGW)
-LIBS := -lmtp -lusb
+LIBS := -lmtp
 ifdef STATIC
 LIBS := -Wl,-Bstatic $(LIBS) -Wl,-Bdynamic
 endif
diff --git a/utils/MTP/beastpatcher/mtp_libmtp.c b/utils/MTP/beastpatcher/mtp_libmtp.c
index 67b009b923..7377c520ea 100644
--- a/utils/MTP/beastpatcher/mtp_libmtp.c
+++ b/utils/MTP/beastpatcher/mtp_libmtp.c
@@ -123,6 +123,8 @@ int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
     size_t n;
     FILE* fwfile;
 
+    (void) ret; /* suppress a set but not used warning */
+
     /* Open a temporary file - this will be automatically deleted when closed */
     fwfile = tmpfile();