mmc: Merge branch fixes into next

Ulf Hansson · Ulf Hansson · commit ec49843332df · 2023-04-05T11:45:35.000+02:00
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 &lt;ulf.hansson@linaro.org&gt;
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ static struct memstick_dev memstick_alloc_card(struct memstick_host host)`
`410`	`410`	`return card;`
`411`	`411`	`err_out:`
`412`	`412`	`host->card = old_card;`
	`413`	`+ kfree_const(card->dev.kobj.name);`
`413`	`414`	`kfree(card);`
`414`	`415`	`return NULL;`
`415`	`416`	`}`
`@@ -468,8 +469,10 @@ static void memstick_check(struct work_struct *work)`
`468`	`469`	`put_device(&card->dev);`
`469`	`470`	`host->card = NULL;`
`470`	`471`	`}`
`471`		`- } else`
	`472`	`+ } else {`
	`473`	`+ kfree_const(card->dev.kobj.name);`
`472`	`474`	`kfree(card);`
	`475`	`+ }`
`473`	`476`	`}`
`474`	`477`
`475`	`478`	`out_power_off:`