diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 18:52:07 (GMT) |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 20:50:41 (GMT) |
| commit | 020abf03cd659388f94cb328e1e1df0656e0d7ff (patch) | |
| tree | 40d05011708ad1b4a05928d167eb120420581aa6 /drivers/dca | |
| parent | 0ff8fbc61727c926883eec381fbd3d32d1fab504 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
| download | linux-fsl-qoriq-020abf03cd659388f94cb328e1e1df0656e0d7ff.tar.xz | |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
Diffstat (limited to 'drivers/dca')
| -rw-r--r-- | drivers/dca/dca-core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c index b98c676..4abd089 100644 --- a/drivers/dca/dca-core.c +++ b/drivers/dca/dca-core.c @@ -110,13 +110,9 @@ static void unregister_dca_providers(void) /* at this point only one domain in the list is expected */ domain = list_first_entry(&dca_domains, struct dca_domain, node); - if (!domain) - return; - list_for_each_entry_safe(dca, _dca, &domain->dca_providers, node) { - list_del(&dca->node); - list_add(&dca->node, &unregistered_providers); - } + list_for_each_entry_safe(dca, _dca, &domain->dca_providers, node) + list_move(&dca->node, &unregistered_providers); dca_free_domain(domain); |