summaryrefslogtreecommitdiff
path: root/supervisor
diff options
context:
space:
mode:
authorHierophect <hierophect@gmail.com>2019-08-04 17:06:51 -0400
committerHierophect <hierophect@gmail.com>2019-08-04 17:19:38 -0400
commita635d46b1a3d16695afa932f53842525eab638e3 (patch)
tree44ab5583bf3900aad02477223fa238a368d46a91 /supervisor
parent0c43bae01ddb10f590e7fe5758ee015580d9a81e (diff)
Fix merge related issues
Diffstat (limited to 'supervisor')
-rw-r--r--supervisor/shared/usb/usb_msc_flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c
index a1ab46454..205cb7b50 100644
--- a/supervisor/shared/usb/usb_msc_flash.c
+++ b/supervisor/shared/usb/usb_msc_flash.c
@@ -197,7 +197,7 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) {
// Invoked when received Start Stop Unit command
// - Start = 0 : stopped power mode, if load_eject = 1 : unload disk storage
// - Start = 1 : active mode, if load_eject = 1 : load disk storage
-void tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject) {
+bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject) {
if (load_eject) {
if (lun > 1) {
return false;