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 tag 'tty-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
hvc
/
hvcs.c
diff --git
a/drivers/tty/hvc/hvcs.c
b/drivers/tty/hvc/hvcs.c
index 81ff7e1bfb1a82ac68dd33d760b84f7edff4e9b8..f7ff97c0ad3499677578b7d1b68ff65c11ab74ec 100644
(file)
--- a/
drivers/tty/hvc/hvcs.c
+++ b/
drivers/tty/hvc/hvcs.c
@@
-1044,8
+1044,8
@@
static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
* It is possible that the vty-server was removed between the time that
* the conn was registered and now.
*/
* It is possible that the vty-server was removed between the time that
* the conn was registered and now.
*/
- if (!(rc = request_irq(irq, &hvcs_handle_interrupt,
-
0, "ibmhvcs", hvcsd))
) {
+ rc = request_irq(irq, &hvcs_handle_interrupt, 0, "ibmhvcs", hvcsd);
+
if (!rc
) {
/*
* It is possible the vty-server was removed after the irq was
* requested but before we have time to enable interrupts.
/*
* It is possible the vty-server was removed after the irq was
* requested but before we have time to enable interrupts.