diff options
| author | Andrew Morton <akpm@osdl.org> | 2007-01-30 03:59:14 -0500 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-01-30 09:20:39 -0500 | 
| commit | 2ca6611b1fc1f913f5370b3c50a0a35d817491b3 (patch) | |
| tree | ca4192cb42abdcc6b375a75decf16397e7755e38 | |
| parent | 7a0f1c8a4b1052da7efc7715e2e557255b632712 (diff) | |
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>
| -rw-r--r-- | drivers/ata/pata_platform.c | 4 | 
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; | |||
| 30 | * Provide our own set_mode() as we don't want to change anything that has | 30 | * Provide our own set_mode() as we don't want to change anything that has | 
| 31 | * already been configured.. | 31 | * already been configured.. | 
| 32 | */ | 32 | */ | 
| 33 | static void pata_platform_set_mode(struct ata_port *ap) | 33 | static int pata_platform_set_mode(struct ata_port *ap, | 
| 34 | struct ata_device **r_failed_dev) | ||
| 34 | { | 35 | { | 
| 35 | int i; | 36 | int i; | 
| 36 | 37 | ||
| @@ -44,6 +45,7 @@ static void pata_platform_set_mode(struct ata_port *ap) | |||
| 44 | dev->flags |= ATA_DFLAG_PIO; | 45 | dev->flags |= ATA_DFLAG_PIO; | 
| 45 | } | 46 | } | 
| 46 | } | 47 | } | 
| 48 | return 0; | ||
| 47 | } | 49 | } | 
| 48 | 50 | ||
| 49 | static void pata_platform_host_stop(struct ata_host *host) | 51 | static void pata_platform_host_stop(struct ata_host *host) | 
