More EDD fixes for merge errors

f7827443 · Linus Torvalds · 3af2127d · f7827443
Commit f7827443 authored Dec 05, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

arch/i386/kernel/edd.c arch/i386/kernel/edd.c +2 -3

No files found.
--- a/arch/i386/kernel/edd.c
+++ b/arch/i386/kernel/edd.c
@@ -701,7 +701,6 @@ edd_find_matching_scsi_device(struct edd_device *edev)
 	struct list_head *sdev_node;
 	int rc = 1;
 	struct scsi_device *sd = NULL;
-	struct device *sdev_dev;
 	struct pci_dev *pci_dev;
 	rc = edd_dev_is_type(edev, "SCSI");
@@ -714,8 +713,8 @@ edd_find_matching_scsi_device(struct edd_device *edev)
 	get_device(&pci_dev->dev);
-	list_for_each(sdev_node, &shost_dev->children) {
+	list_for_each(sdev_node, &pci_dev->dev.children) {
-		sdev_dev = children_to_dev(sdev_node);
+		struct device *sdev_dev = children_to_dev(sdev_node);
 		get_device(sdev_dev);
 		sd = to_scsi_device(sdev_dev);
 		rc = edd_match_scsidev(edev, sd);