diff options
| author | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@lithui.me.apana.org.au> | 2017-12-22 04:00:50 -0500 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /drivers/of/unittest.c | |
| parent | fc8517bf627c9b834f80274a1bc9ecd39b27231b (diff) | |
| parent | 2973633e9f09311e849f975d969737af81a521ff (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'drivers/of/unittest.c')
| -rw-r--r-- | drivers/of/unittest.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index e568b1e82501..0f8052f1355c 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c | |||
| @@ -2165,7 +2165,6 @@ static int __init overlay_data_add(int onum) | |||
| 2165 | ret = of_overlay_apply(info->np_overlay, &info->overlay_id); | 2165 | ret = of_overlay_apply(info->np_overlay, &info->overlay_id); |
| 2166 | if (ret < 0) { | 2166 | if (ret < 0) { |
| 2167 | pr_err("of_overlay_apply() (ret=%d), %d\n", ret, onum); | 2167 | pr_err("of_overlay_apply() (ret=%d), %d\n", ret, onum); |
| 2168 | of_overlay_mutex_unlock(); | ||
| 2169 | goto out_free_np_overlay; | 2168 | goto out_free_np_overlay; |
| 2170 | } | 2169 | } |
| 2171 | 2170 | ||