djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3292 from jepler/allocate_display_bus_bug 

allocate_display_bus: fix bug where in-use bus would be returned
This commit is contained in:
Scott Shawcroft 2020-08-21 11:19:50 -07:00 committed by GitHub
parent 988e5caafc 6d2d36db3d
commit 5771be9510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared-module/displayio/__init__.c
View File

@ -394,8 +394,8 @@ primary_display_t *allocate_display_or_raise(void) {
} }
primary_display_t *allocate_display_bus(void) { primary_display_t *allocate_display_bus(void) {
for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) { for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
mp_const_obj_t display_type = displays[i].display.base.type; mp_const_obj_t display_bus_type = displays[i].bus_base.type;
if (display_type == NULL || display_type == &mp_type_NoneType) { if (display_bus_type == NULL || display_bus_type == &mp_type_NoneType) {
return &displays[i]; return &displays[i];
} }
} }