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

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

From: Timmy Yee <shoujun@masterofpi.org>

This patch adds missing ampersands.

diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 7047756c26b2f815260853166fc1ab9f42ce74a5..63e30e07f9b0ff16887788b4dc024bfcdcf173c1 100644 (file)
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -743,7 +743,7 @@ static void ps2esdi_geometry_int_handler(u_int int_ret_code)
        drive_num = int_ret_code >> 5;
        switch (int_ret_code & 0xf) {
        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)) {
                        printk("%s: timeout reading status word\n", DEVICE_NAME);
                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
@@ -879,7 +879,7 @@ static void ps2esdi_normal_interrupt_handler(u_int int_ret_code)
                break;
 
        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)) {
                        printk("%s: timeout reading status word\n", DEVICE_NAME);
                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);