mmc: Register debugfs dir before calling card probe function.
authorViresh Kumar <viresh.kumar@st.com>
Tue, 4 Jan 2011 17:55:14 +0000 (12:55 -0500)
committerChris Ball <cjb@laptop.org>
Sun, 9 Jan 2011 04:52:26 +0000 (23:52 -0500)
This way, the probe function may register debugfs files if it wants to.
This fixes a bug with mmc_test where mmc_test_register_file_test() is
called before the card's debugfs dir exists, and so it fails.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Tested-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/core/bus.c

index af8dc6a2a317d6b82a0b27d3b100bacd86a48108..63667a8f140c458722c54b33b3e91d54e4cca029 100644 (file)
@@ -303,14 +303,14 @@ int mmc_add_card(struct mmc_card *card)
                        type, card->rca);
        }
 
-       ret = device_add(&card->dev);
-       if (ret)
-               return ret;
-
 #ifdef CONFIG_DEBUG_FS
        mmc_add_card_debugfs(card);
 #endif
 
+       ret = device_add(&card->dev);
+       if (ret)
+               return ret;
+
        mmc_card_set_present(card);
 
        return 0;