| commit | 372d668a279934ff3b2ec2f07a76fe2f351789d5 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Jun 24 15:27:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 24 15:27:43 2013 -0700 |
| tree | 333e0436a0d6d200e7617694f7451e1c93bb40b8 | |
| parent | 9270f12529fdcadaacd9d2bce3ceeeb07d037aa8 [diff] | |
| parent | 39021a48a0e0687c654423acd5a4c99a1d79440d [diff] |
am 39021a48: am 83ada447: Merge changes Ib54f39fd,I7e36edd8 * commit '39021a48a0e0687c654423acd5a4c99a1d79440d': init: Retain traditional restart behavior for critical and oneshot services. init: Safely restart services to avoid race conditions.
diff --git a/init/devices.c b/init/devices.c index 69f5fc8..de27a7a 100644 --- a/init/devices.c +++ b/init/devices.c
@@ -785,6 +785,7 @@ file_free_out: free(file1); free(file2); + free(file3); data_free_out: free(data); loading_free_out: