patch #10029: linuxspi: Report GPIO_GET_LINEHANDLE_IOCTL errors

dl8dtl · dl8dtl · commit 6f183d427cd8 · 2021-11-27T15:46:10.000Z
Submitted by Alex Sverdlin:
* linuxspi.c (linuxspi_open): Report ioctl error




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1493 81a1dc3b-b13d-400b-aceb-764788c761c2
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2021-11-27  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Alex Sverdlin:
+	patch #10029: linuxspi: Report GPIO_GET_LINEHANDLE_IOCTL errors
+	* linuxspi.c (linuxspi_open): Report ioctl error
+
 2021-11-27  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	Submitted by Alex Sverdlin:
diff --git a/NEWS b/NEWS
@@ -119,6 +119,7 @@ Current:
     patch #9328: ft245r.c: add TPI support (patches 5-7)
     patch #10027: linuxspi: Add reset pulse, according to AVR programming algorithm
     patch #10028: linuxspi: close() only when necessary
+    patch #10029: linuxspi: Report GPIO_GET_LINEHANDLE_IOCTL errors
 
   * Internals:
     - New avrdude.conf keyword "family_id", used to verify SIB attributes
diff --git a/linuxspi.c b/linuxspi.c
@@ -170,6 +170,8 @@ static int linuxspi_open(PROGRAMMER *pgm, char *port)
     ret = ioctl(fd_gpiochip, GPIO_GET_LINEHANDLE_IOCTL, &req);
     if (ret == -1) {
         ret = -errno;
+        avrdude_message(MSG_INFO, "%s error: Unable to get GPIO line %d\n",
+                        progname, pgm->pinno[PIN_AVR_RESET] & ~PIN_INVERSE);
         goto close_gpiochip;
     }
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +2021-11-27  Joerg Wunsch <[email protected]>
++
 +	Submitted by Alex Sverdlin:
 +	patch #10029: linuxspi: Report GPIO_GET_LINEHANDLE_IOCTL errors
 +	* linuxspi.c (linuxspi_open): Report ioctl error
++
 -11-27  Joerg Wunsch <[email protected]>
 	Submitted by Alex Sverdlin:
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,8 @@ static int linuxspi_open(PROGRAMMER pgm, char port)`
`170`	`170`	`ret = ioctl(fd_gpiochip, GPIO_GET_LINEHANDLE_IOCTL, &req);`
`171`	`171`	`if (ret == -1) {`
`172`	`172`	`ret = -errno;`
	`173`	`+ avrdude_message(MSG_INFO, "%s error: Unable to get GPIO line %d\n",`
	`174`	`+ progname, pgm->pinno[PIN_AVR_RESET] & ~PIN_INVERSE);`
`173`	`175`	`goto close_gpiochip;`
`174`	`176`	`}`
`175`	`177`