Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 002ae084 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jeff Garzik
Browse files

libata-sff: use ATAPI_{COD|IO} 



atapi_pio_bytes() uses bare numbers for the ATAPI interrupt reason bits despite
these are #define'd in <linux/ata.h>.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9ee4f393

drivers/ata/libata-sff.c

+2 −2
Original line number Diff line number Diff line
@@ -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;