Skip to content

Commit

Permalink
libata-sff: use ATAPI_{COD|IO}
Browse files Browse the repository at this point in the history
atapi_pio_bytes() uses bare numbers for the ATAPI interrupt reason bits despite
these are #define'd in <linux/ata.h>.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Sergei Shtylyov authored and Jeff Garzik committed Jan 9, 2012
1 parent 9ee4f39 commit 002ae08
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/ata/libata-sff.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,11 +929,11 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)
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;

Expand Down

0 comments on commit 002ae08

Please sign in to comment.