summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-01-30 09:59:14 +0100
committerJeff Garzik <jeff@garzik.org>2007-01-30 15:20:39 +0100
commit2ca6611b1fc1f913f5370b3c50a0a35d817491b3 (patch)
treeca4192cb42abdcc6b375a75decf16397e7755e38 /drivers
parentata_if_xfermask() word 51 fix (diff)
downloadlinux-2ca6611b1fc1f913f5370b3c50a0a35d817491b3.tar.xz
linux-2ca6611b1fc1f913f5370b3c50a0a35d817491b3.zip
pata_platform: set_mode fix
drivers/ata/pata_platform.c:85: warning: initialization from incompatible pointer type Cc: Jeff Garzik <jeff@garzik.org> Cc: Tejun Heo <htejun@gmail.com> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_platform.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 443b1d85c6c4..ca2999f9f048 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -30,7 +30,8 @@ static int pio_mask = 1;
* Provide our own set_mode() as we don't want to change anything that has
* already been configured..
*/
-static void pata_platform_set_mode(struct ata_port *ap)
+static int pata_platform_set_mode(struct ata_port *ap,
+ struct ata_device **r_failed_dev)
{
int i;
@@ -44,6 +45,7 @@ static void pata_platform_set_mode(struct ata_port *ap)
dev->flags |= ATA_DFLAG_PIO;
}
}
+ return 0;
}
static void pata_platform_host_stop(struct ata_host *host)