diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-10-17 18:59:42 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-17 18:59:42 -0700 |
| commit | f9a102470e95e30bcd850fed819699fbdd98221c (patch) | |
| tree | 222f41a28025bc8329f5b520581c069163075088 /drivers/remoteproc | |
| parent | 5d3e8a2357969f708006f4545ea116ef5fb15d3c (diff) | |
| parent | 7195c0804fff8a0dde6f1d214ce300b5fe907482 (diff) | |
| download | kernel_samsung_tuna-f9a102470e95e30bcd850fed819699fbdd98221c.zip kernel_samsung_tuna-f9a102470e95e30bcd850fed819699fbdd98221c.tar.gz kernel_samsung_tuna-f9a102470e95e30bcd850fed819699fbdd98221c.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/remoteproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/remoteproc/remoteproc.c b/drivers/remoteproc/remoteproc.c index 17eb1eb..2ecbcef 100644 --- a/drivers/remoteproc/remoteproc.c +++ b/drivers/remoteproc/remoteproc.c @@ -1155,7 +1155,7 @@ int rproc_set_secure(const char *name, bool enable) * restart the processor, the mode will dictate regular load or * secure load */ - _event_notify(rproc, RPROC_ERROR, NULL); + _event_notify(rproc, RPROC_SECURE, (void *)enable); /* block until the restart is complete */ if (wait_for_completion_interruptible(&rproc->secure_restart)) { |