couple fixes not yet in official esp-idf

- fix i2c crash - fix usb when enabling wifi Co-authored-by: Jeff Epler <jepler@gmail.com> Co-authored-by: Scott Shawcroft <scott@adafruit.com>
adafruit · Jan 25, 2022 · 2775b6e · 2775b6e · dhalbert · Feb 3, 2022
1 parent 0b46ac1
commit 2775b6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/components/driver/i2c.c b/components/driver/i2c.c
@@ -1342,7 +1342,9 @@ static void IRAM_ATTR i2c_master_cmd_begin_static(i2c_port_t i2c_num)
             p_i2c->cmd_idx = 0;
             if (i2c_cmd_is_single_byte(cmd) || cmd->total_bytes == cmd->bytes_used) {
                 p_i2c->cmd_link.head = p_i2c->cmd_link.head->next;
-                p_i2c->cmd_link.head->cmd.bytes_used = 0;
+                if (p_i2c->cmd_link.head != NULL) {
+                    p_i2c->cmd_link.head->cmd.bytes_used = 0;
+                }
             }
             p_i2c->status = I2C_STATUS_WRITE;
             break;

diff --git a/components/esp_phy/Kconfig b/components/esp_phy/Kconfig
@@ -106,7 +106,7 @@ menu "PHY"
 
     config ESP_PHY_ENABLE_USB
         bool "Enable USB when phy init"
-        depends on USB_OTG_SUPPORTED || ESP_CONSOLE_USB_SERIAL_JTAG
+        depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || ESP_CONSOLE_USB_SERIAL_JTAG
         default y if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
         default n
         help