x86: move disabled_cpus to smpboot.c (64bit)

[safe/jmp/linux-2.6] / drivers / ata / pata_winbond.c

diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 7312e91..99c92ed 100644 (file)
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -92,8 +92,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
 }
 
 
-static void winbond_data_xfer(struct ata_device *dev, unsigned char *buf,
-                             unsigned int buflen, int rw)
+static unsigned int winbond_data_xfer(struct ata_device *dev,
+                       unsigned char *buf, unsigned int buflen, int rw)
 {
        struct ata_port *ap = dev->link->ap;
        int slop = buflen & 3;
@@ -195,7 +195,7 @@ static __init int winbond_init_one(unsigned long port)
        reg = winbond_readcfg(port, 0x81);
 
        if (!(reg & 0x03))              /* Disabled */
-               return 0;
+               return -ENODEV;
 
        for (i = 0; i < 2 ; i ++) {
                unsigned long cmd_port = 0x1F0 - (0x80 * i);