Actually apply patch #10028 :)

dl8dtl · dl8dtl · commit d2085039110a · 2021-11-27T15:43:57.000Z
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1492 81a1dc3b-b13d-400b-aceb-764788c761c2
diff --git a/linuxspi.c b/linuxspi.c
@@ -157,7 +157,6 @@ static int linuxspi_open(PROGRAMMER *pgm, char *port)
 
     fd_gpiochip = open(gpiochip, 0);
     if (fd_gpiochip < 0) {
-        close(fd_spidev);
         avrdude_message(MSG_INFO, "\n%s error: Unable to open the gpiochip %s", progname, gpiochip);
         ret = -1;
         goto close_spidev;
@@ -193,6 +192,7 @@ static int linuxspi_open(PROGRAMMER *pgm, char *port)
 
 static void linuxspi_close(PROGRAMMER *pgm)
 {
+    close(fd_linehandle);
     close(fd_spidev);
     close(fd_gpiochip);
 }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ static int linuxspi_open(PROGRAMMER pgm, char port)`
`157`	`157`
`158`	`158`	`fd_gpiochip = open(gpiochip, 0);`
`159`	`159`	`if (fd_gpiochip < 0) {`
`160`		`- close(fd_spidev);`
`161`	`160`	`avrdude_message(MSG_INFO, "\n%s error: Unable to open the gpiochip %s", progname, gpiochip);`
`162`	`161`	`ret = -1;`
`163`	`162`	`goto close_spidev;`
`@@ -193,6 +192,7 @@ static int linuxspi_open(PROGRAMMER pgm, char port)`
`193`	`192`
`194`	`193`	`static void linuxspi_close(PROGRAMMER *pgm)`
`195`	`194`	`{`
	`195`	`+ close(fd_linehandle);`
`196`	`196`	`close(fd_spidev);`
`197`	`197`	`close(fd_gpiochip);`
`198`	`198`	`}`