projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
hvc
/
hvc_iucv.c
diff --git
a/drivers/tty/hvc/hvc_iucv.c
b/drivers/tty/hvc/hvc_iucv.c
index fd17a9b804b8ab8608097661b824e27c5bb1cd02..db19a38c8c69b0d33dddac2c1fff95f3f79b80f3 100644
(file)
--- a/
drivers/tty/hvc/hvc_iucv.c
+++ b/
drivers/tty/hvc/hvc_iucv.c
@@
-1354,8
+1354,7
@@
out_error_memory:
mempool_destroy(hvc_iucv_mempool);
kmem_cache_destroy(hvc_iucv_buffer_cache);
out_error:
mempool_destroy(hvc_iucv_mempool);
kmem_cache_destroy(hvc_iucv_buffer_cache);
out_error:
- if (hvc_iucv_filter)
- kfree(hvc_iucv_filter);
+ kfree(hvc_iucv_filter);
hvc_iucv_devices = 0; /* ensure that we do not provide any device */
return rc;
}
hvc_iucv_devices = 0; /* ensure that we do not provide any device */
return rc;
}