diff options
author | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
commit | b1630da0589dbf520e4cf565eda6a74c5a813962 (patch) | |
tree | 290df4d4e49d96ed4df1dfa68ead45991e85cd2e /drivers/clocksource/timer-keystone.c | |
parent | USB: u132-hcd: Fix seperate word in printk message (diff) | |
parent | Linux 4.3-rc5 (diff) | |
download | kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.gz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.xz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.zip |
Merge 4.3-rc5 into usb-next
We want the USB fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clocksource/timer-keystone.c')
-rw-r--r-- | drivers/clocksource/timer-keystone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c index edacf3902e10..1cea08cf603e 100644 --- a/drivers/clocksource/timer-keystone.c +++ b/drivers/clocksource/timer-keystone.c @@ -152,7 +152,7 @@ static void __init keystone_timer_init(struct device_node *np) int irq, error; irq = irq_of_parse_and_map(np, 0); - if (irq == NO_IRQ) { + if (!irq) { pr_err("%s: failed to map interrupts\n", __func__); return; } |