summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-29 23:57:51 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-29 23:57:51 +0200
commit3431e490b50356b56084305a2e93b3a980802b22 (patch)
treeda5213c3c05df56711a097c95e8a1410a46df78d /lib
parent5af310a8ee70dd6a588c8ee1d4487a230a7b7b65 (diff)
parent1dcc3d3362b0c97e48290f7786be85b4cec2a147 (diff)
downloadlinux-3431e490b50356b56084305a2e93b3a980802b22.tar.bz2
Merge branch 'acpi-scan' into acpi-pm
Conflicts: drivers/acpi/scan.c The conflict is resolved by moving the just introduced acpi_device_is_first_physical_node() to bus.c and using the existing acpi_companion_match() from there. There will be an additional commit to combine the two.
Diffstat (limited to 'lib')
-rw-r--r--lib/rhashtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index a60a6d335a91..cc0c69710dcf 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -610,6 +610,8 @@ next:
iter->skip = 0;
}
+ iter->p = NULL;
+
/* Ensure we see any new tables. */
smp_rmb();
@@ -620,8 +622,6 @@ next:
return ERR_PTR(-EAGAIN);
}
- iter->p = NULL;
-
return NULL;
}
EXPORT_SYMBOL_GPL(rhashtable_walk_next);