From c6869465635b893f7f3b8f1fba9fc7b55950a87e Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Mon, 15 Feb 2016 20:29:53 +0000 Subject: [PATCH] patch #8895: Spelling in 6.2 code git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1373 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 5 +++++ NEWS | 1 + avrftdi.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1132613c..f1a91aab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-02-15 Joerg Wunsch + + patch #8895: Spelling in 6.2 code + * avrftdi.c (avrftdi_open): Spell fix. + 2016-02-15 Joerg Wunsch patch #8896: Silence cppcheck warnings in 6.2 code diff --git a/NEWS b/NEWS index 076257aa..0abf9805 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,7 @@ Current: - patch #8435: Implementing mEDBG CMSIS-DAP protocol - patch #8735: ATtiny28 support in avrdude.conf - patch #8896: Silence cppcheck warnings in 6.2 code + - patch #8895: Spelling in 6.2 code * Internals: diff --git a/avrftdi.c b/avrftdi.c index 71c7eef5..29d10332 100644 --- a/avrftdi.c +++ b/avrftdi.c @@ -703,7 +703,7 @@ static int avrftdi_open(PROGRAMMER * pgm, char *port) err = ftdi_usb_open_desc_index(pdata->ftdic, vid, pid, desc, serial, index); if(err) { - log_err("Error %d occured: %s\n", err, ftdi_get_error_string(pdata->ftdic)); + log_err("Error %d occurred: %s\n", err, ftdi_get_error_string(pdata->ftdic)); //stupid hack, because avrdude calls pgm->close() even when pgm->open() fails //and usb_dev is intialized to the last usb device from probing pdata->ftdic->usb_dev = NULL;