From 3a7da864f24aa066d9b91372c2ea9b4e305fa58f Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sun, 14 Jan 2007 01:41:45 +0100 Subject: [PATCH] --- yaml --- r: 46190 b: refs/heads/master c: 11354d03afe9dd0d114e078057158baad4b4eee9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/mmc_sysfs.c | 2 +- trunk/include/linux/mmc/host.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 28dcbb716379..353ee4698ade 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f22ee4edf63e7480511112d9965c71e07be3f8b7 +refs/heads/master: 11354d03afe9dd0d114e078057158baad4b4eee9 diff --git a/trunk/drivers/mmc/mmc_sysfs.c b/trunk/drivers/mmc/mmc_sysfs.c index e334acd045bc..d32698b02d7f 100644 --- a/trunk/drivers/mmc/mmc_sysfs.c +++ b/trunk/drivers/mmc/mmc_sysfs.c @@ -199,7 +199,7 @@ void mmc_init_card(struct mmc_card *card, struct mmc_host *host) memset(card, 0, sizeof(struct mmc_card)); card->host = host; device_initialize(&card->dev); - card->dev.parent = mmc_dev(host); + card->dev.parent = mmc_classdev(host); card->dev.bus = &mmc_bus_type; card->dev.release = mmc_release_card; } diff --git a/trunk/include/linux/mmc/host.h b/trunk/include/linux/mmc/host.h index dc4c6e395198..ae98d6766bdd 100644 --- a/trunk/include/linux/mmc/host.h +++ b/trunk/include/linux/mmc/host.h @@ -127,6 +127,7 @@ static inline void *mmc_priv(struct mmc_host *host) } #define mmc_dev(x) ((x)->parent) +#define mmc_classdev(x) (&(x)->class_dev) #define mmc_hostname(x) ((x)->class_dev.bus_id) extern int mmc_suspend_host(struct mmc_host *, pm_message_t);