Attachment 152986 Details for Bug 235902 – Bug fix (I hope)

[patch] Bug fix (I hope)

a1 (text/plain), 1.10 KB, created by Alan Cox on 2007-04-19 10:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Cox

Created: 2007-04-19 10:03:17 UTC

Size: 1.10 KB

patch

obsolete

>--- linux.vanilla-2.6.21-rc6-mm1/drivers/ata/pata_sis.c	2007-04-12 14:15:03.000000000 +0100
>+++ linux-2.6.21-rc6-mm1/drivers/ata/pata_sis.c	2007-04-19 10:42:36.966672184 +0100
>@@ -831,6 +831,7 @@
> 	struct ata_port_info *port;
> 	struct pci_dev *host = NULL;
> 	struct sis_chipset *chipset = NULL;
>+	struct sis_chipset *sets;
> 
> 	static struct sis_chipset sis_chipsets[] = {
> 
>@@ -885,10 +886,11 @@
> 
> 	/* We have to find the bridge first */
> 
>-	for (chipset = &sis_chipsets[0]; chipset->device; chipset++) {
>-		host = pci_get_device(PCI_VENDOR_ID_SI, chipset->device, NULL);
>+	for (sets = &sis_chipsets[0]; sets->device; sets++) {
>+		host = pci_get_device(PCI_VENDOR_ID_SI, sets->device, NULL);
> 		if (host != NULL) {
>-			if (chipset->device == 0x630) {	/* SIS630 */
>+			chipset = sets;			/* Match found */
>+			if (sets->device == 0x630) {	/* SIS630 */
> 				u8 host_rev;
> 				pci_read_config_byte(host, PCI_REVISION_ID, &host_rev);
> 				if (host_rev >= 0x30)	/* 630 ET */
>@@ -899,7 +901,7 @@
> 	}
> 
> 	/* Look for concealed bridges */
>-	if (host == NULL) {
>+	if (chipset == NULL) {
> 		/* Second check */
> 		u32 idemisc;
> 		u16 trueid;

Actions: View | Diff

Attachments on bug 235902: 152487 | 152852 | 152853 | 152966 | 152967 | 152968 | 152969 | 152986 | 153056 | 153057 | 154592 | 154608 | 155980 | 157394