Commit da114027 authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman

[PATCH] janitor: ps2esdi: fix '&' to '&&'

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Timmy Yee <shoujun@masterofpi.org>

This patch adds missing ampersands.
parent 3d28867a
...@@ -743,7 +743,7 @@ static void ps2esdi_geometry_int_handler(u_int int_ret_code) ...@@ -743,7 +743,7 @@ static void ps2esdi_geometry_int_handler(u_int int_ret_code)
drive_num = int_ret_code >> 5; drive_num = int_ret_code >> 5;
switch (int_ret_code & 0xf) { switch (int_ret_code & 0xf) {
case INT_CMD_COMPLETE: case INT_CMD_COMPLETE:
for (i = ESDI_TIMEOUT; i & !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--); for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) { if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
printk("%s: timeout reading status word\n", DEVICE_NAME); printk("%s: timeout reading status word\n", DEVICE_NAME);
outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN); outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
...@@ -879,7 +879,7 @@ static void ps2esdi_normal_interrupt_handler(u_int int_ret_code) ...@@ -879,7 +879,7 @@ static void ps2esdi_normal_interrupt_handler(u_int int_ret_code)
break; break;
case INT_CMD_COMPLETE: case INT_CMD_COMPLETE:
for (i = ESDI_TIMEOUT; i & !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--); for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) { if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
printk("%s: timeout reading status word\n", DEVICE_NAME); printk("%s: timeout reading status word\n", DEVICE_NAME);
outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN); outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment