diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
| commit | 68c404b18f6fba404b2753622d0459c68ee128ae (patch) | |
| tree | c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3 /drivers/spi/spi.c | |
| parent | d035c36c58dd9183ad6aa7875dea89893faedb55 (diff) | |
| parent | 6650239a4b01077e80d5a4468562756d77afaa59 (diff) | |
Merge branch 'bugfixes' into nfs-for-2.6.38
Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
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 709c836607d..b02d0cbce89 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); |