From b53f1698242ef797b7176e32a92b92f282d998d6 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 3 Sep 2019 14:46:47 -0700
Subject: [PATCH] Fix I2CDisplay bus_free to not grab lock

Fixes #2098
---
 shared-module/displayio/Display.c    | 2 +-
 shared-module/displayio/I2CDisplay.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index f210a80c3c..212ee8c7b1 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -90,7 +90,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
             self->core.send(self->core.bus, DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, cmd, 1);
             self->core.send(self->core.bus, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, data, data_size);
         }
-        self->core.end_transaction(self->core.bus);
+        displayio_display_core_end_transaction(&self->core);
         uint16_t delay_length_ms = 10;
         if (delay) {
             data_size++;
diff --git a/shared-module/displayio/I2CDisplay.c b/shared-module/displayio/I2CDisplay.c
index 87261dca00..a3b167a331 100644
--- a/shared-module/displayio/I2CDisplay.c
+++ b/shared-module/displayio/I2CDisplay.c
@@ -91,11 +91,13 @@ bool common_hal_displayio_i2cdisplay_bus_free(mp_obj_t obj) {
     if (!common_hal_busio_i2c_try_lock(self->bus)) {
         return false;
     }
+    common_hal_busio_i2c_unlock(self->bus);
     return true;
 }
 
 bool common_hal_displayio_i2cdisplay_begin_transaction(mp_obj_t obj) {
-    return common_hal_displayio_i2cdisplay_bus_free(obj);
+    displayio_i2cdisplay_obj_t* self = MP_OBJ_TO_PTR(obj);
+    return !common_hal_busio_i2c_try_lock(self->bus);
 }
 
 void common_hal_displayio_i2cdisplay_send(mp_obj_t obj, display_byte_type_t data_type, display_chip_select_behavior_t chip_select, uint8_t *data, uint32_t data_length) {