|
Takashi Iwai |
99c1ca |
From 9183f01b5e6e32eb3f17b5f3f8d5ad5ac9786c49 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
99c1ca |
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
99c1ca |
Date: Thu, 6 May 2021 16:00:47 +0200
|
|
Takashi Iwai |
99c1ca |
Subject: [PATCH] cdrom: gdrom: initialize global variable at init time
|
|
Takashi Iwai |
99c1ca |
Git-commit: 9183f01b5e6e32eb3f17b5f3f8d5ad5ac9786c49
|
|
Takashi Iwai |
99c1ca |
Patch-mainline: v5.13-rc3
|
|
Takashi Iwai |
99c1ca |
References: git-fixes
|
|
Takashi Iwai |
99c1ca |
|
|
Takashi Iwai |
99c1ca |
As Peter points out, if we were to disconnect and then reconnect this
|
|
Takashi Iwai |
99c1ca |
driver from a device, the "global" state of the device would contain odd
|
|
Takashi Iwai |
99c1ca |
values and could cause problems. Fix this up by just initializing the
|
|
Takashi Iwai |
99c1ca |
whole thing to 0 at probe() time.
|
|
Takashi Iwai |
99c1ca |
|
|
Takashi Iwai |
99c1ca |
Ideally this would be a per-device variable, but given the age and the
|
|
Takashi Iwai |
99c1ca |
total lack of users of it, that would require a lot of s/./->/g changes
|
|
Takashi Iwai |
99c1ca |
for really no good reason.
|
|
Takashi Iwai |
99c1ca |
|
|
Takashi Iwai |
99c1ca |
Reported-by: Peter Rosin <peda@axentia.se>
|
|
Takashi Iwai |
99c1ca |
Cc: Jens Axboe <axboe@kernel.dk>
|
|
Takashi Iwai |
99c1ca |
Reviewed-by: Peter Rosin <peda@axentia.se>
|
|
Takashi Iwai |
99c1ca |
Link: https://lore.kernel.org/r/YJP2j6AU82MqEY2M@kroah.com
|
|
Takashi Iwai |
99c1ca |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
99c1ca |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
99c1ca |
|
|
Takashi Iwai |
99c1ca |
---
|
|
Takashi Iwai |
99c1ca |
drivers/cdrom/gdrom.c | 9 ++++++++-
|
|
Takashi Iwai |
99c1ca |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
Takashi Iwai |
99c1ca |
|
|
Takashi Iwai |
99c1ca |
--- a/drivers/cdrom/gdrom.c
|
|
Takashi Iwai |
99c1ca |
+++ b/drivers/cdrom/gdrom.c
|
|
Takashi Iwai |
99c1ca |
@@ -740,6 +740,13 @@ static const struct blk_mq_ops gdrom_mq_
|
|
Takashi Iwai |
99c1ca |
static int probe_gdrom(struct platform_device *devptr)
|
|
Takashi Iwai |
99c1ca |
{
|
|
Takashi Iwai |
99c1ca |
int err;
|
|
Takashi Iwai |
99c1ca |
+
|
|
Takashi Iwai |
99c1ca |
+ /*
|
|
Takashi Iwai |
99c1ca |
+ * Ensure our "one" device is initialized properly in case of previous
|
|
Takashi Iwai |
99c1ca |
+ * usages of it
|
|
Takashi Iwai |
99c1ca |
+ */
|
|
Takashi Iwai |
99c1ca |
+ memset(&gd, 0, sizeof(gd));
|
|
Takashi Iwai |
99c1ca |
+
|
|
Takashi Iwai |
99c1ca |
/* Start the device */
|
|
Takashi Iwai |
99c1ca |
if (gdrom_execute_diagnostic() != 1) {
|
|
Takashi Iwai |
99c1ca |
pr_warning("ATA Probe for GDROM failed\n");
|
|
Takashi Iwai |
99c1ca |
@@ -845,7 +852,7 @@ static struct platform_driver gdrom_driv
|
|
Takashi Iwai |
99c1ca |
static int __init init_gdrom(void)
|
|
Takashi Iwai |
99c1ca |
{
|
|
Takashi Iwai |
99c1ca |
int rc;
|
|
Takashi Iwai |
99c1ca |
- gd.toc = NULL;
|
|
Takashi Iwai |
99c1ca |
+
|
|
Takashi Iwai |
99c1ca |
rc = platform_driver_register(&gdrom_driver);
|
|
Takashi Iwai |
99c1ca |
if (rc)
|
|
Takashi Iwai |
99c1ca |
return rc;
|