From 4d823b0fd3188c6bde12a4edfc0d70d17bc71551 Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Thu, 11 Jun 2009 13:02:59 +0100 Subject: [PATCH] --- yaml --- r: 146269 b: refs/heads/master c: aba6593bf77371e71331ba76dacc98b47760cba3 h: refs/heads/master i: 146267: e532c13c6042c4a89b7ddd06b180b5e50fd549f8 v: v3 --- [refs] | 2 +- trunk/drivers/serial/icom.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 29d0ded48022..1e00492ce707 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13858d36903990441a89eb342247b71436808eeb +refs/heads/master: aba6593bf77371e71331ba76dacc98b47760cba3 diff --git a/trunk/drivers/serial/icom.c b/trunk/drivers/serial/icom.c index a461b3b2c72d..fd5fd23804bc 100644 --- a/trunk/drivers/serial/icom.c +++ b/trunk/drivers/serial/icom.c @@ -408,7 +408,7 @@ static void load_code(struct icom_port *icom_port) release_firmware(fw); /* Set Hardware level */ - if ((icom_port->adapter->version | ADAPTER_V2) == ADAPTER_V2) + if (icom_port->adapter->version == ADAPTER_V2) writeb(V2_HARDWARE, &(icom_port->dram->misc_flags)); /* Start the processor in Adapter */ @@ -861,7 +861,7 @@ static irqreturn_t icom_interrupt(int irq, void *dev_id) /* find icom_port for this interrupt */ icom_adapter = (struct icom_adapter *) dev_id; - if ((icom_adapter->version | ADAPTER_V2) == ADAPTER_V2) { + if (icom_adapter->version == ADAPTER_V2) { int_reg = icom_adapter->base_addr + 0x8024; adapter_interrupts = readl(int_reg);