Merge pull request #10653 from desowin/stm-usb-host

0xc0170 · web-flow · commit df84eb1b2821 · 2019-06-09T18:01:46.000+01:00
STM USBHALHost: Fix NULL pointer dereference
diff --git a/features/unsupported/USBHost/targets/TARGET_STM/USBHALHost_STM.h b/features/unsupported/USBHost/targets/TARGET_STM/USBHALHost_STM.h
@@ -122,10 +122,14 @@ static gpio_t gpio_powerpin;
 
 void usb_vbus(uint8_t state)
 {
-    if (state == 0) {
-        gpio_write(&gpio_powerpin, USB_POWER_OFF);
+    if (gpio_powerpin.reg_set && gpio_powerpin.reg_clr) {
+        if (state == 0) {
+            gpio_write(&gpio_powerpin, USB_POWER_OFF);
+        } else {
+            gpio_write(&gpio_powerpin, USB_POWER_ON);
+        }
     } else {
-        gpio_write(&gpio_powerpin, USB_POWER_ON);
+        /* The board does not have GPIO pin to control usb supply */
     }
     wait(0.2);
 }

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,14 @@ static gpio_t gpio_powerpin;`
`122`	`122`
`123`	`123`	`void usb_vbus(uint8_t state)`
`124`	`124`	`{`
`125`		`- if (state == 0) {`
`126`		`- gpio_write(&gpio_powerpin, USB_POWER_OFF);`
	`125`	`+ if (gpio_powerpin.reg_set && gpio_powerpin.reg_clr) {`
	`126`	`+ if (state == 0) {`
	`127`	`+ gpio_write(&gpio_powerpin, USB_POWER_OFF);`
	`128`	`+ } else {`
	`129`	`+ gpio_write(&gpio_powerpin, USB_POWER_ON);`
	`130`	`+ }`
`127`	`131`	`} else {`
`128`		`- gpio_write(&gpio_powerpin, USB_POWER_ON);`
	`132`	`+ /* The board does not have GPIO pin to control usb supply */`
`129`	`133`	`}`
`130`	`134`	`wait(0.2);`
`131`	`135`	`}`