diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /drivers/of/unittest.c | |
| parent | 5e54b3c1202765ae62de24a160f1eaf6b0ebf9d4 (diff) | |
| parent | f335195adf043168ee69d78ea72ac3e30f0c57ce (diff) | |
| download | linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.gz linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
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) ret = of_overlay_apply(info->np_overlay, &info->overlay_id); if (ret < 0) { pr_err("of_overlay_apply() (ret=%d), %d\n", ret, onum); - of_overlay_mutex_unlock(); goto out_free_np_overlay; } |