diff options
| author | Brian Wood <brian.j.wood@intel.com> | 2017-02-27 16:58:40 -0800 |
|---|---|---|
| committer | Brian Wood <brian.j.wood@intel.com> | 2017-02-28 15:35:14 -0800 |
| commit | b7147432cf0d58533bd21fe594d0be1d153f91a6 (patch) | |
| tree | aec042cd9c91432c09285381c5d5af85072975c9 /crypto/algapi.c | |
| parent | ce7cfcfa1251122880d34fae7259309b64a78434 (diff) | |
| parent | ec55e7c2bf49a426b6f8204505bd267c77554d37 (diff) | |
| download | edison-v3.10-android-n-iot-preview-4.tar.gz | |
Merge remote-tracking branch 'remotes/origin/brillo/linux-3.10.y' into Brillo-20170221-3.10_kernelandroid-n-iot-preview-4n-iot-preview-4
Conflicts:
crypto/blkcipher.c
drivers/platform/x86/intel_scu_ipcutil.c
drivers/usb/gadget/u_ether.c
fs/ext4/extents.c
net/bluetooth/sco.c
net/wireless/scan.c
Change-Id: Iaea6d22acb3da6b0477d71cf546858d35295e3d2
Diffstat (limited to 'crypto/algapi.c')
| -rw-r--r-- | crypto/algapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index 00d8d939733..daf2f653b13 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -325,7 +325,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval) crypto_alg_tested(larval->alg.cra_driver_name, 0); } - err = wait_for_completion_interruptible(&larval->completion); + err = wait_for_completion_killable(&larval->completion); WARN_ON(err); out: |