aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-12 15:01:16 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-12 15:01:16 -0700
commit408af0dab78ef4145203b849d6bfd3195f6e3ec9 (patch)
tree0d94116829dc6874888b5be97fb9af048c7d71c3
parent7e6973e9aca997d95995a7b17768f7b77b7c6c24 (diff)
parent77f1fd6ecd04556cbac1ca72e7a284ae313ea538 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: use correct unregister function for led trigger
-rw-r--r--drivers/mmc/core/host.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 64fbc9759a3..c65d203a846 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -143,7 +143,7 @@ void mmc_remove_host(struct mmc_host *host)
device_del(&host->class_dev);
- led_trigger_unregister(host->led);
+ led_trigger_unregister_simple(host->led);
spin_lock(&mmc_host_lock);
idr_remove(&mmc_host_idr, host->index);