diff options
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r-- | drivers/ieee1394/nodemgr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 47c0d85e0f32..994a21e5a0aa 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
@@ -754,7 +754,8 @@ static void nodemgr_remove_uds(struct node_entry *ne) | |||
754 | */ | 754 | */ |
755 | mutex_lock(&nodemgr_serialize_remove_uds); | 755 | mutex_lock(&nodemgr_serialize_remove_uds); |
756 | for (;;) { | 756 | for (;;) { |
757 | dev = class_find_device(&nodemgr_ud_class, ne, __match_ne); | 757 | dev = class_find_device(&nodemgr_ud_class, NULL, ne, |
758 | __match_ne); | ||
758 | if (!dev) | 759 | if (!dev) |
759 | break; | 760 | break; |
760 | ud = container_of(dev, struct unit_directory, unit_dev); | 761 | ud = container_of(dev, struct unit_directory, unit_dev); |
@@ -901,7 +902,8 @@ static struct node_entry *find_entry_by_guid(u64 guid) | |||
901 | struct device *dev; | 902 | struct device *dev; |
902 | struct node_entry *ne; | 903 | struct node_entry *ne; |
903 | 904 | ||
904 | dev = class_find_device(&nodemgr_ne_class, &guid, __match_ne_guid); | 905 | dev = class_find_device(&nodemgr_ne_class, NULL, &guid, |
906 | __match_ne_guid); | ||
905 | if (!dev) | 907 | if (!dev) |
906 | return NULL; | 908 | return NULL; |
907 | ne = container_of(dev, struct node_entry, node_dev); | 909 | ne = container_of(dev, struct node_entry, node_dev); |
@@ -940,7 +942,8 @@ static struct node_entry *find_entry_by_nodeid(struct hpsb_host *host, | |||
940 | param.host = host; | 942 | param.host = host; |
941 | param.nodeid = nodeid; | 943 | param.nodeid = nodeid; |
942 | 944 | ||
943 | dev = class_find_device(&nodemgr_ne_class, ¶m, __match_ne_nodeid); | 945 | dev = class_find_device(&nodemgr_ne_class, NULL, ¶m, |
946 | __match_ne_nodeid); | ||
944 | if (!dev) | 947 | if (!dev) |
945 | return NULL; | 948 | return NULL; |
946 | ne = container_of(dev, struct node_entry, node_dev); | 949 | ne = container_of(dev, struct node_entry, node_dev); |