From c9aeaf8928fcfd45a8f1c39dbb46d320a7590c67 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sun, 27 Jun 2021 20:42:06 +0000 Subject: [PATCH] Submitted by gerardoallende: bug #59525: Bogus error message because Copy/Paste typo in stk500.c * stk500.c (stk500_getparm): Fix bogus ID in error message git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1453 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 6 ++++++ NEWS | 1 + stk500.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index feea3994..0e606b3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,3 +3,9 @@ bug #60753: Patch #1436 breaks multiple programmer/device combinations on MacOS BigSur * avr.c: compare page_size > 1 instead of != 0 * stk500v2.c: (Ditto.) + +2021-06-27 Joerg Wunsch + + Submitted by gerardoallende: + bug #59525: Bogus error message because Copy/Paste typo in stk500.c + * stk500.c (stk500_getparm): Fix bogus ID in error message diff --git a/NEWS b/NEWS index 6cdbabf5..08161caa 100644 --- a/NEWS +++ b/NEWS @@ -51,6 +51,7 @@ Current: bug #58095: error setting efuse on atmega328pb variant no-id: efuse section on ATmega32M1 lacks 'size' bug #60753: Patch #1436 breaks multiple programmer/device combinations on MacOS BigSur + bug #59525: Bogus error message because Copy/Paste typo in stk500.c * Patches: patch #9482: Add support for UPDI and AVR8X diff --git a/stk500.c b/stk500.c index a2bf1fb5..ebb22a27 100644 --- a/stk500.c +++ b/stk500.c @@ -1118,7 +1118,7 @@ static int stk500_getparm(PROGRAMMER * pgm, unsigned parm, unsigned * value) else if (buf[0] != Resp_STK_OK) { avrdude_message(MSG_INFO, "\n%s: stk500_getparm(): (a) protocol error, " "expect=0x%02x, resp=0x%02x\n", - progname, Resp_STK_INSYNC, buf[0]); + progname, Resp_STK_OK, buf[0]); return -3; }