diff options
| author | Aleksei Musin <[email protected]> | 2026-02-09 12:22:20 +0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-02-09 12:22:20 +0400 |
| commit | 6e675da608b063e2ea7db1d700d788d6a247f9ec (patch) | |
| tree | 5bcf5bb529e6ca2ebefc889920b28f1fab851e3f /examples/device | |
| parent | ebc9edfb7a512c8dd6816a40698c62c364bd78da (diff) | |
| parent | f5424c569ddc673a9c23b78febceed8f7f098509 (diff) | |
Merge branch 'hathach:master' into threadx_osal
Diffstat (limited to 'examples/device')
| -rw-r--r-- | examples/device/dfu/skip.txt | 2 | ||||
| -rw-r--r-- | examples/device/mtp/src/mtp_fs_example.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/device/dfu/skip.txt b/examples/device/dfu/skip.txt index 9dde06c30..79d3da9d2 100644 --- a/examples/device/dfu/skip.txt +++ b/examples/device/dfu/skip.txt @@ -1,3 +1,3 @@ -mcu:TM4C123 +mcu:TM4C mcu:BCM2835 family:espressif diff --git a/examples/device/mtp/src/mtp_fs_example.c b/examples/device/mtp/src/mtp_fs_example.c index 7fd7db61b..60fc9f79e 100644 --- a/examples/device/mtp/src/mtp_fs_example.c +++ b/examples/device/mtp/src/mtp_fs_example.c @@ -557,7 +557,7 @@ static int32_t fs_send_object_info(tud_mtp_cb_data_t* cb_data) { return MTP_RESP_INVALID_STORAGE_ID; } - if (obj_info->parent_object != 0) { // not root + if (obj_info->parent_object != 0 && obj_info->parent_object != 0xFFFFFFFFu) { // not root fs_file_t* parent = fs_get_file(obj_info->parent_object); if (parent == NULL || 0u == parent->association_type) { return MTP_RESP_INVALID_PARENT_OBJECT; |