Commit ec498433 authored by Ulf Hansson's avatar Ulf Hansson

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
...@@ -410,6 +410,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) ...@@ -410,6 +410,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host)
return card; return card;
err_out: err_out:
host->card = old_card; host->card = old_card;
kfree_const(card->dev.kobj.name);
kfree(card); kfree(card);
return NULL; return NULL;
} }
...@@ -468,8 +469,10 @@ static void memstick_check(struct work_struct *work) ...@@ -468,8 +469,10 @@ static void memstick_check(struct work_struct *work)
put_device(&card->dev); put_device(&card->dev);
host->card = NULL; host->card = NULL;
} }
} else } else {
kfree_const(card->dev.kobj.name);
kfree(card); kfree(card);
}
} }
out_power_off: out_power_off:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment