diff options
| author | Scott Anderson <saa@android.com> | 2012-05-01 18:34:22 -0700 |
|---|---|---|
| committer | Scott Anderson <saa@android.com> | 2012-05-01 18:34:22 -0700 |
| commit | a61bcad58ba1f7359183a333ee58303ed67e4a2f (patch) | |
| tree | c30d316882119d9acbc9fa9adaf3c0fce11d219b /fastboot/engine.c | |
| parent | 048f24600f389bb756cf9c6ea93774f31fd588ad (diff) | |
| parent | 13081c6915220db03886b177f1a8e0b2c63467c9 (diff) | |
| download | system_core-a61bcad58ba1f7359183a333ee58303ed67e4a2f.tar.gz system_core-a61bcad58ba1f7359183a333ee58303ed67e4a2f.tar.bz2 system_core-a61bcad58ba1f7359183a333ee58303ed67e4a2f.zip | |
resolved conflicts for merge of 13081c69 to master
Change-Id: I631e466fc53e9b0f4a39f24f959b4ae9b626bdda
Diffstat (limited to 'fastboot/engine.c')
| -rw-r--r-- | fastboot/engine.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fastboot/engine.c b/fastboot/engine.c index 994eeae2..a1b65391 100644 --- a/fastboot/engine.c +++ b/fastboot/engine.c @@ -520,6 +520,8 @@ int fb_execute_queue(usb_handle *usb) int status = 0; a = action_list; + if (!a) + return status; resp[FB_RESPONSE_SZ] = 0; double start = -1; @@ -556,3 +558,8 @@ int fb_execute_queue(usb_handle *usb) fprintf(stderr,"finished. total time: %.3fs\n", (now() - start)); return status; } + +int fb_queue_is_empty(void) +{ + return (action_list == NULL); +} |