1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index beaed12d50e4..9524d54035f7 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -1,6 +1,7 @@
 /*
  * pata_serverworks.c   - Serverworks PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
+ *                        (C) 2010 Bartlomiej Zolnierkiewicz
  *
  * based upon
  *
@@ -253,7 +254,7 @@ static void serverworks_set_piomode(struct ata_port *ap, struct ata_device *adev
         if (serverworks_is_csb(pdev)) {
                 pci_read_config_word(pdev, 0x4A, &csb5_pio);
                 csb5_pio &= ~(0x0F << devbits);
-                pci_write_config_byte(pdev, 0x4A, csb5_pio | (pio << devbits));
+                pci_write_config_word(pdev, 0x4A, csb5_pio | (pio << devbits));
         }
 }
 
@@ -327,7 +328,7 @@ static int serverworks_fixup_osb4(struct pci_dev *pdev)
                 pci_dev_put(isa_dev);
                 return 0;
         }
-        printk(KERN_WARNING "ata_serverworks: Unable to find bridge.\n");
+        printk(KERN_WARNING DRV_NAME ": Unable to find bridge.\n");
         return -ENODEV;
 }
 
@@ -459,7 +460,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
         if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
                 ata_pci_bmdma_clear_simplex(pdev);
 
-        return ata_pci_sff_init_one(pdev, ppi, &serverworks_sht, NULL);
+        return ata_pci_sff_init_one(pdev, ppi, &serverworks_sht, NULL, 0);
 }
 
 #ifdef CONFIG_PM