From d20010dd6cca0339387b950337798a366bf0f387 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Wed, 5 Dec 2007 16:43:02 +0900 Subject: [PATCH] --- yaml --- r: 76900 b: refs/heads/master c: 0106372db6dc135f300035ce8e93cddd7283a26a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f538412a4291..ba8d846785eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93f8fecbe72bc3c121f3605dd198ff39ef358522 +refs/heads/master: 0106372db6dc135f300035ce8e93cddd7283a26a diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 2b57547bd740..c9e6bd4d0686 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -5309,12 +5309,15 @@ 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 (ireason & (1 << 0)) + if (unlikely(ireason & (1 << 0))) goto err_out; /* make sure transfer direction matches expected */ i_write = ((ireason & (1 << 1)) == 0) ? 1 : 0; - if (do_write != i_write) + if (unlikely(do_write != i_write)) + goto err_out; + + if (unlikely(!bytes)) goto err_out; VPRINTK("ata%u: xfering %d bytes\n", ap->print_id, bytes);