diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-04-05 11:45:35 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-04-05 11:45:35 +0200 |
| commit | ec49843332dfffe85408b0a33acc818ff6c068b8 (patch) | |
| tree | eb158e650c470a3a4e934d84deb2fe406ab3e155 /drivers/memstick | |
| parent | 9d2e77ff2bd3b94c930a1f5b75abada7e196fa6d (diff) | |
| parent | 4b6d621c9d859ff89e68cebf6178652592676013 (diff) | |
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: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/core/memstick.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index bf7667845459..bbfaf6536903 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c @@ -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,8 +469,10 @@ 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: |