diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-25 10:52:59 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-25 10:52:59 +0200 |
| commit | d1e16c1a61d68692dba346f4a841315343b085f4 (patch) | |
| tree | 249ec07d1489769fe83b4ec507708455cc0c5138 /drivers/net/dummy.c | |
| parent | ASoC: dmaengine_pcm: fix typo in comment (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-d1e16c1a61d68692dba346f4a841315343b085f4.tar.xz linux-d1e16c1a61d68692dba346f4a841315343b085f4.zip | |
Merge tag 'v3.5-rc4' into for-3.6
Linux 3.5-rc4 contains some bug fixes which overlap with new features.
Diffstat (limited to 'drivers/net/dummy.c')
| -rw-r--r-- | drivers/net/dummy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index 442d91a2747b..bab0158f1cc3 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c @@ -187,8 +187,10 @@ static int __init dummy_init_module(void) rtnl_lock(); err = __rtnl_link_register(&dummy_link_ops); - for (i = 0; i < numdummies && !err; i++) + for (i = 0; i < numdummies && !err; i++) { err = dummy_init_one(); + cond_resched(); + } if (err < 0) __rtnl_link_unregister(&dummy_link_ops); rtnl_unlock(); |