Re: [PATCH] IDE (& PowerMac): Let an hwif have a real parent

[Benjamin Herrenschmidt]

> Looks good.
> 
> > Please apply,
> > Ben.
> 
> Can you fix intendation, or I should do it?

Hrm... I don't know how I fucked it up, probably when merging
between my trees. Here's the fixed version:

diff -urN linux-2.5/drivers/ide/ide-probe.c linux-2.5-benh-merge/drivers/ide/ide-probe.c
--- linux-2.5/drivers/ide/ide-probe.c	2003-08-09 11:05:27.000000000 +0200
+++ linux-2.5-benh-merge/drivers/ide/ide-probe.c	2003-08-10 22:30:14.000000000 +0200
@@ -650,10 +650,13 @@
 	strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE);
 	snprintf(hwif->gendev.name,DEVICE_NAME_SIZE,"IDE Controller");
 	hwif->gendev.driver_data = hwif;
-	if (hwif->pci_dev)
-		hwif->gendev.parent = &hwif->pci_dev->dev;
-	else
-		hwif->gendev.parent = NULL; /* Would like to do = &device_legacy */
+	if (hwif->gendev.parent == NULL) {
+		if (hwif->pci_dev)
+			hwif->gendev.parent = &hwif->pci_dev->dev;
+		else
+			/* Would like to do = &device_legacy */
+			hwif->gendev.parent = NULL;
+	}
 	device_register(&hwif->gendev);
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/