mmc: core: Do not export MMC_NAME= and MODALIAS=mmc:block for SDIO cards

SDIO non-combo cards are not handled by mmc_block driver and do not have
accessible CID register which is used for MMC_NAME= construction.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Link: https://lore.kernel.org/r/20200527110858.17504-1-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 74de3f2..b1cb447 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -93,6 +93,13 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
                        return retval;
        }
 
+       /*
+        * SDIO (non-combo) cards are not handled by mmc_block driver and do not
+        * have accessible CID register which used by mmc_card_name() function.
+        */
+       if (card->type == MMC_TYPE_SDIO)
+               return 0;
+
        retval = add_uevent_var(env, "MMC_NAME=%s", mmc_card_name(card));
        if (retval)
                return retval;