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

Merge pull request #2653 from tannewt/fix_usb_eject_after_sleep 

Fix Mac crash when waking up with an ejected CIRCUITPY
This commit is contained in:
Scott Shawcroft 2020-02-25 10:54:42 -08:00 committed by GitHub
parent 09ab24b967 876c646d09
commit 7037ebe0ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
supervisor/shared/usb/usb_msc_flash.c
View File

@ -208,6 +208,8 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) {
return false;
}
if (ejected[lun]) {
// Set 0x3a for media not present.
tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3A, 0x00);
return false;
}
@ -243,10 +245,8 @@ bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, boo
if (disk_ioctl(current_mount, CTRL_SYNC, NULL) != RES_OK) {
return false;
}
} else {
// Start the unit, but only if not ejected.
return !ejected[lun];
}
// Always start the unit, even if ejected. Whether media is present is a separate check.
}
return true;