Commit ec498433 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.3-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.4.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 9d2e77ff 4b6d621c

drivers/memstick/core/memstick.c

+4 −1
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) 
	return card;

err_out:

	host->card = old_card;

	kfree_const(card->dev.kobj.name);

	kfree(card);

	return NULL;

}
@@ -468,9 +469,11 @@ static void memstick_check(struct work_struct *work) 
				put_device(&card->dev);

				host->card = NULL;

			}

		} else

		} else {

			kfree_const(card->dev.kobj.name);

			kfree(card);

		}

	}



out_power_off:

	if (!host->card)