On Tue, Dec 01, 2009 at 03:13:00PM +0000, Daniel Drake wrote:
> diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
> index cdb845b..fa07d4f 100644
> --- a/drivers/mmc/core/sdio.c
> +++ b/drivers/mmc/core/sdio.c
> @@ -516,7 +516,8 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
> * The number of functions on the card is encoded inside
> * the ocr.
> */
> - card->sdio_funcs = funcs = (ocr & 0x70000000) >> 28;
> + funcs = (ocr & 0x70000000) >> 28;
> + card->sdio_funcs = 0;
>
> /*
> * If needed, disconnect card detection pull-up resistor.
> @@ -528,10 +529,11 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
> /*
> * Initialize (but don't add) all present functions.
> */
> - for (i = 0;i < funcs;i++) {
> + for (i = 0;i < funcs;i++, card->sdio_funcs++) {
> err = sdio_init_func(host->card, i + 1);
> if (err)
> goto remove;
> + card->sdio_funcs = i + 1;
> }
I don't understand what you're trying to do here. The card->sdio_funcs++
should take care of incrementing the sdio_funcs count properly. When the
loop terminates both "i" and "card->sdio_funcs" will be equal to
"funcs", unless we jump to the remove label. Unless I've missed
something?
Isn't this hunk below fixing a slightly different bug? Admittedly, it
could cause a crash, but I think it warrants a separate patch and
changelog.
I assumed you would be sending a patch just for this bug below and not
for the one above (which I is why I submitted one). I wasn't very clear
about that though ;-)
> diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
> index d37464e..9e060c8 100644
> --- a/drivers/mmc/core/sdio_bus.c
> +++ b/drivers/mmc/core/sdio_bus.c
> @@ -248,12 +248,15 @@ int sdio_add_func(struct sdio_func *func)
> /*
> * Unregister a SDIO function with the driver model, and
> * (eventually) free it.
> + * This function can be called through error paths where sdio_add_func() was
> + * never executed (because a failure occurred at an earlier point).
> */
> void sdio_remove_func(struct sdio_func *func)
> {
> - if (sdio_func_present(func))
> - device_del(&func->dev);
> + if (!sdio_func_present(func))
> + return;
>
> + device_del(&func->dev);
> put_device(&func->dev);
> }
>
> --
> 1.6.2.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
