summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_rb532_cf.c
diff options
context:
space:
mode:
authorPhil Sutter <n0-1@freewrt.org>2008-11-28 20:48:35 +0100
committerJeff Garzik <jgarzik@redhat.com>2008-12-01 13:49:17 -0500
commit03f60840fa462e92220b093f778b2426ceab23af (patch)
tree5770676fec230ddee8357b3210890f34f80a6bf8 /drivers/ata/pata_rb532_cf.c
parent9f14786e27908a176f0568cf2132558efef71b31 (diff)
downloadop-kernel-dev-03f60840fa462e92220b093f778b2426ceab23af.zip
op-kernel-dev-03f60840fa462e92220b093f778b2426ceab23af.tar.gz
[libata] pata_rb532_cf: fix signature of the xfer function
Per definition, this function should return the number of bytes consumed. As the original parameter "buflen" is being decremented inside the read/write loop, save it in "retlen" at the beginning. Signed-off-by: Phil Sutter <n0-1@freewrt.org> Acked-by: Sergei Shtyltov <sshtylyov@ru.mvista.com> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Acked-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/pata_rb532_cf.c')
-rw-r--r--drivers/ata/pata_rb532_cf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index 392116c..c2e6fb9 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -74,11 +74,12 @@ static void rb532_pata_exec_command(struct ata_port *ap,
rb532_pata_finish_io(ap);
}
-static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
+static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
unsigned int buflen, int write_data)
{
struct ata_port *ap = adev->link->ap;
void __iomem *ioaddr = ap->ioaddr.data_addr;
+ int retlen = buflen;
if (write_data) {
for (; buflen > 0; buflen--, buf++)
@@ -89,6 +90,7 @@ static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
}
rb532_pata_finish_io(adev->link->ap);
+ return retlen;
}
static void rb532_pata_freeze(struct ata_port *ap)
OpenPOWER on IntegriCloud