diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:54 -0500 |
| commit | cc2221969906a166a638aecdbae84a3d0462719e (patch) | |
| tree | 2483f726e226c309207e1d0250660eea6e1787b8 /drivers/spi/spi.c | |
| parent | 56f4c400349157289b474a3fd49ee96acab0a4d7 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 709c836607de..b02d0cbce890 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -584,8 +584,7 @@ void spi_unregister_master(struct spi_master *master) | |||
| 584 | list_del(&master->list); | 584 | list_del(&master->list); |
| 585 | mutex_unlock(&board_lock); | 585 | mutex_unlock(&board_lock); |
| 586 | 586 | ||
| 587 | dummy = device_for_each_child(master->dev.parent, &master->dev, | 587 | dummy = device_for_each_child(&master->dev, NULL, __unregister); |
| 588 | __unregister); | ||
| 589 | device_unregister(&master->dev); | 588 | device_unregister(&master->dev); |
| 590 | } | 589 | } |
| 591 | EXPORT_SYMBOL_GPL(spi_unregister_master); | 590 | EXPORT_SYMBOL_GPL(spi_unregister_master); |