diff options
author | Kay Sievers <kay@vrfy.org> | 2014-01-05 18:53:39 +0400 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2014-01-05 18:55:03 +0400 |
commit | 4bf7665c760bdd011cee3c5a9b03c8e109991241 (patch) | |
tree | 5b04fa75cc41cd156cee0ccdc29f2d8f5ed52812 /src/bus-driverd | |
parent | af13a6b0606f166c93cafc9892343f167f880281 (diff) |
Revert "bus: driverd: don't attempt to remove from empty list"
We need to find the real reason for the failure, this just
avoids the symptoms.
This reverts commit 215c7625dd510759290d45d6c46434e4338843ec.
Diffstat (limited to 'src/bus-driverd')
-rw-r--r-- | src/bus-driverd/bus-driverd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c index f8a123d4f1..44172c4ed6 100644 --- a/src/bus-driverd/bus-driverd.c +++ b/src/bus-driverd/bus-driverd.c @@ -90,10 +90,10 @@ static void match_free(Match *m) { Match *first; first = hashmap_get(m->client->matches, m->match); - if (first) { - LIST_REMOVE(matches, first, m); + LIST_REMOVE(matches, first, m); + if (first) assert_se(hashmap_replace(m->client->matches, m->match, first) >= 0); - } else + else hashmap_remove(m->client->matches, m->match); m->client->n_matches--; |