Commit f7827443 authored by Linus Torvalds's avatar Linus Torvalds

More EDD fixes for merge errors

parent 3af2127d
...@@ -701,7 +701,6 @@ edd_find_matching_scsi_device(struct edd_device *edev) ...@@ -701,7 +701,6 @@ edd_find_matching_scsi_device(struct edd_device *edev)
struct list_head *sdev_node; struct list_head *sdev_node;
int rc = 1; int rc = 1;
struct scsi_device *sd = NULL; struct scsi_device *sd = NULL;
struct device *sdev_dev;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
rc = edd_dev_is_type(edev, "SCSI"); rc = edd_dev_is_type(edev, "SCSI");
...@@ -714,8 +713,8 @@ edd_find_matching_scsi_device(struct edd_device *edev) ...@@ -714,8 +713,8 @@ edd_find_matching_scsi_device(struct edd_device *edev)
get_device(&pci_dev->dev); 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); get_device(sdev_dev);
sd = to_scsi_device(sdev_dev); sd = to_scsi_device(sdev_dev);
rc = edd_match_scsidev(edev, sd); rc = edd_match_scsidev(edev, sd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment