author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2021-05-06 16:00:47 +0200
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2021-05-13 18:58:44 +0200
commit: 9183f01b5e6e32eb3f17b5f3f8d5ad5ac9786c49
parent: 419b4a142a7ece36cebcd434f8ce2af59ef94b85
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 1 deletion
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 6c4f6139f853..c6d8c0f59722 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -744,6 +744,13 @@ static const struct blk_mq_ops gdrom_mq_ops = {
static int probe_gdrom(struct platform_device *devptr)
{
int err;
+
+ /*
+ * Ensure our "one" device is initialized properly in case of previous
+ * usages of it
+ */
+ memset(&gd, 0, sizeof(gd));
+
/* Start the device */
if (gdrom_execute_diagnostic() != 1) {
pr_warn("ATA Probe for GDROM failed\n");
@@ -847,7 +854,7 @@ static struct platform_driver gdrom_driver = {
static int __init init_gdrom(void)
{
int rc;
- gd.toc = NULL;
+
rc = platform_driver_register(&gdrom_driver);
if (rc)
return rc;