Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb41748_mtp_activation' into 'master'
Enable android usb before starting mtpd

See merge request mer-core/usb-moded!38
  • Loading branch information
spiiroin committed Sep 12, 2018
2 parents 9ee51c1 + 171d582 commit 1ab7831
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/usb_moded-worker.c
Expand Up @@ -531,7 +531,9 @@ worker_switch_to_mode(const char *mode)
* as they will use the worker_get_usb_mode_data function */
worker_set_usb_mode_data(data);

if( worker_mode_is_mtp_mode(mode) ) {
/* When dealing with configfs, we can't enable UDC without
* already having mtpd running */
if( worker_mode_is_mtp_mode(mode) && configfs_in_use() ) {
if( !worker_start_mtpd() )
goto FAILED;
}
Expand All @@ -542,6 +544,14 @@ worker_switch_to_mode(const char *mode)
if( !modesetting_enter_dynamic_mode() )
goto FAILED;

/* When dealing with android usb, it must be enabled before
* we can start mtpd. Assumption is that the same applies
* when using kernel modules. */
if( worker_mode_is_mtp_mode(mode) && !configfs_in_use() ) {
if( !worker_start_mtpd() )
goto FAILED;
}

goto SUCCESS;
}

Expand Down

0 comments on commit 1ab7831

Please sign in to comment.