Skip to content

Commit a674b8c

Browse files
authored
Merge pull request adafruit#10874 from dhalbert/atmel-samd-deinit-fix
atmel-samd SPI: don't mark_deinit before resetting pin
2 parents 244dc80 + a2d29c5 commit a674b8c

File tree

1 file changed

+3
-3
lines changed
  • ports/atmel-samd/common-hal/busio

1 file changed

+3
-3
lines changed

ports/atmel-samd/common-hal/busio/SPI.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,14 @@ void common_hal_busio_spi_deinit(busio_spi_obj_t *self) {
194194
}
195195
allow_reset_sercom(self->spi_desc.dev.prvt);
196196

197-
// Mark as deinit early in case we are used in an interrupt.
198-
common_hal_busio_spi_mark_deinit(self);
199-
200197
spi_m_sync_disable(&self->spi_desc);
201198
spi_m_sync_deinit(&self->spi_desc);
202199
reset_pin_number(self->clock_pin);
203200
reset_pin_number(self->MOSI_pin);
204201
reset_pin_number(self->MISO_pin);
202+
203+
// This smashes self->clock_pin, so don't do it before resetting the pin above.
204+
common_hal_busio_spi_mark_deinit(self);
205205
}
206206

207207
bool common_hal_busio_spi_configure(busio_spi_obj_t *self,

0 commit comments

Comments
 (0)