Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146269
b: refs/heads/master
c: aba6593
h: refs/heads/master
i:
  146267: e532c13
v: v3
  • Loading branch information
Breno Leitao authored and Linus Torvalds committed Jun 11, 2009
1 parent 108b230 commit 4d823b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 13858d36903990441a89eb342247b71436808eeb
refs/heads/master: aba6593bf77371e71331ba76dacc98b47760cba3
4 changes: 2 additions & 2 deletions trunk/drivers/serial/icom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4d823b0

Please sign in to comment.