libata fixes (incl. oops fix)
PATCH 1/1 libata fixes (incl. oops fix)
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/ata_piix.c | 2 +- drivers/ata/sata_nv.c | 6 +++--- drivers/ata/sata_sis.c | 6 +++--- drivers/ata/sata_uli.c | 6 +++--- drivers/ata/sata_via.c | 7 ++++--- 5 files changed, 14 insertions(+), 13 deletions(-)
Henne:
ata-piix: fixes kerneldoc error
Jeff Garzik:
[libata] Fix oops introduced in non-uniform port handling fix
drivers/ata/ata_piix.c +1 -1
@@ -851,7 +851,7 @@ static void piix_set_piomode (struct ata* @ap: Port whose timings we are configuring * @adev: Drive in question * @udma: udma mode, 0 - 6 -* @is_ich: set if the chip is an ICH device +* @isich: set if the chip is an ICH device * * Set UDMA mode for device, in host controller PCI config space. *
drivers/ata/sata_nv.c +3 -3
@@ -484,7 +484,7 @@ static void nv_error_handler(struct ata_static int nv_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static int printed_version =0 ; -struct ata_port_info *ppi; +struct ata_port_info *ppi[2 ];struct ata_probe_ent *probe_ent;int pci_dev_busy =0 ;int rc;
@@ -520,8 +520,8 @@ static int nv_init_one (struct pci_dev * rc = -ENOMEM ; - ppi = &nv_port_info[ent->driver_data]; - probe_ent =ata_pci_init_native_mode (pdev, &ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY ); + ppi[0 ] = ppi[1 ] = &nv_port_info[ent->driver_data]; + probe_ent =ata_pci_init_native_mode (pdev, ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY );if (!probe_ent) goto err_out_regions;
drivers/ata/sata_sis.c +3 -3
@@ -240,7 +240,7 @@ static int sis_init_one (struct pci_devstruct ata_probe_ent *probe_ent =NULL ;int rc;u32 genctl; -struct ata_port_info *ppi; +struct ata_port_info *ppi[2 ];int pci_dev_busy =0 ;u8 pmr;u8 port2_start;
@@ -265,8 +265,8 @@ static int sis_init_one (struct pci_devif (rc) goto err_out_regions; - ppi = &sis_port_info; - probe_ent =ata_pci_init_native_mode (pdev, &ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY ); + ppi[0 ] = ppi[1 ] = &sis_port_info; + probe_ent =ata_pci_init_native_mode (pdev, ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY );if (!probe_ent) { rc = -ENOMEM ; goto err_out_regions;
drivers/ata/sata_uli.c +3 -3
@@ -185,7 +185,7 @@ static int uli_init_one (struct pci_dev {static int printed_version;struct ata_probe_ent *probe_ent; -struct ata_port_info *ppi; +struct ata_port_info *ppi[2 ];int rc;unsigned int board_idx = (unsigned int ) ent->driver_data;int pci_dev_busy =0 ;
@@ -211,8 +211,8 @@ static int uli_init_one (struct pci_devif (rc) goto err_out_regions; - ppi = &uli_port_info; - probe_ent =ata_pci_init_native_mode (pdev, &ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY ); + ppi[0 ] = ppi[1 ] = &uli_port_info; + probe_ent =ata_pci_init_native_mode (pdev, ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY );if (!probe_ent) { rc = -ENOMEM ; goto err_out_regions;
drivers/ata/sata_via.c +4 -3
@@ -318,9 +318,10 @@ static void vt6421_init_addrs(struct atastatic struct ata_probe_ent *vt6420_init_probe_ent (struct pci_dev *pdev) {struct ata_probe_ent *probe_ent; -struct ata_port_info *ppi = &vt6420_port_info; - - probe_ent =ata_pci_init_native_mode (pdev, &ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY ); +struct ata_port_info *ppi[2 ]; + + ppi[0 ] = ppi[1 ] = &vt6420_port_info; + probe_ent =ata_pci_init_native_mode (pdev, ppi,ATA_PORT_PRIMARY |ATA_PORT_SECONDARY );if (!probe_ent)return NULL ;
Ar Llu, 2006-09-25 am 21:58 -0400, ysgrifennodd Jeff Garzik:
Quoted 2 lines
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
Acked-by Alan Cox <[email protected]>