Merge remote-tracking branch 'origin/main' into main

weblate · weblate · commit 1a0529c5d2d0 · 2021-07-02T13:34:40.000+02:00
diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
@@ -118,8 +118,12 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
 void common_hal_busio_spi_never_reset(busio_spi_obj_t *self) {
     spi_never_reset[self->host_id] = true;
     common_hal_never_reset_pin(self->clock);
-    common_hal_never_reset_pin(self->MOSI);
-    common_hal_never_reset_pin(self->MISO);
+    if (self->MOSI != NULL) {
+        common_hal_never_reset_pin(self->MOSI);
+    }
+    if (self->MISO != NULL) {
+        common_hal_never_reset_pin(self->MISO);
+    }
 }
 
 bool common_hal_busio_spi_deinited(busio_spi_obj_t *self) {
