From patchwork Thu Dec 1 15:53:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: libata-sff: use ATAPI_{COD|IO} From: Sergei Shtylyov X-Patchwork-Id: 128706 Message-Id: <201112011853.28829.sshtylyov@ru.mvista.com> To: linux-ide@vger.kernel.org, jgarzik@pobox.com Date: Thu, 1 Dec 2011 18:53:28 +0300 atapi_pio_bytes() uses bare numbers for the ATAPI interrupt reason bits despite these are #define'd in . Signed-off-by: Sergei Shtylyov --- This patch is against the recent Linus' tree. drivers/ata/libata-sff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/ata/libata-sff.c =================================================================== --- linux-2.6.orig/drivers/ata/libata-sff.c +++ linux-2.6/drivers/ata/libata-sff.c @@ -929,11 +929,11 @@ static void atapi_pio_bytes(struct ata_q bytes = (bc_hi << 8) | bc_lo; /* shall be cleared to zero, indicating xfer of data */ - if (unlikely(ireason & (1 << 0))) + if (unlikely(ireason & ATAPI_COD)) goto atapi_check; /* make sure transfer direction matches expected */ - i_write = ((ireason & (1 << 1)) == 0) ? 1 : 0; + i_write = ((ireason & ATAPI_IO) == 0) ? 1 : 0; if (unlikely(do_write != i_write)) goto atapi_check;