From 39eb936c7ec8ef1dccb88d3bcfc1c5fa2410c472 Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Tue, 13 Sep 2005 00:36:45 +0200 Subject: [PATCH] sata_sis: Fix typo in sata port2 initialisation This patch fixes a nasty typo I introduced in my previous patch (commit f2c853bca542f5ac0b036377637192a74f2091c2). The right offset of the second port in pure sata mode is 64 and not 0x64. Thanks to Martin Schuster for pointing this to me Signed-off-by: Arnaud Patard --- Signed-off-by: Jeff Garzik --- drivers/scsi/sata_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi/sata_sis.c') diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index a63f931..237c198 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c @@ -289,7 +289,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) if (ent->device != 0x182) { if ((pmr & SIS_PMR_COMBINED) == 0) { printk(KERN_INFO "sata_sis: Detected SiS 180/181 chipset in SATA mode\n"); - port2_start=0x64; + port2_start = 64; } else { printk(KERN_INFO "sata_sis: Detected SiS 180/181 chipset in combined mode\n"); -- cgit v1.1 From 668e4bc7229c1866f65f3bef6ab011f8c9034089 Mon Sep 17 00:00:00 2001 From: Uwe Koziolek Date: Sun, 11 Sep 2005 17:03:35 +0200 Subject: [PATCH] sata_sis: uninitialized variable There is an uninitialized variable issue in sata_sis.c Signed-off-by: Jeff Garzik --- drivers/scsi/sata_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi/sata_sis.c') diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index 237c198..b227e51 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c @@ -161,7 +161,7 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg) { struct pci_dev *pdev = to_pci_dev(ap->host_set->dev); unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, sc_reg, pdev->device); - u32 val, val2; + u32 val, val2 = 0; u8 pmr; if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */ -- cgit v1.1