| Message ID | 20200527110858.17504-1-pali@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] mmc: core: Do not export MMC_NAME= and MODALIAS=mmc:block for SDIO cards | expand |
On Wed, 27 May 2020 at 13:09, Pali Rohár <pali@kernel.org> wrote: > > 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> Applied for next, thanks! Kind regards Uffe > > --- > Changes in V2: > * Use early returns pattern > --- > drivers/mmc/core/bus.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c > index 74de3f2dd..b1cb447da 100644 > --- 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; > -- > 2.20.1 >
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 74de3f2dd..b1cb447da 100644 --- 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;