ata: pata_legacy: make legacy_exit() work again

commit d4a89339f17c87c4990070e9116462d16e75894f upstream.

Commit defc9cd826e4 ("pata_legacy: resychronize with upstream changes and
resubmit") missed to update legacy_exit(), so that it now fails to do any
cleanup -- the loop body there can never be entered.  Fix that and finally
remove now useless nr_legacy_host variable...

Found by Linux Verification Center (linuxtesting.org) with the Svace static
analysis tool.

Fixes: defc9cd826e4 ("pata_legacy: resychronize with upstream changes and resubmit")
Cc: stable@vger.kernel.org
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 4405d255e3aa2807b5e2560a04c6a1b7a76f4dca..220739b309ea3eb85d2c1b86d9dd996caeef34e8 100644 (file)
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -114,8 +114,6 @@ static int legacy_port[NR_HOST] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 };
 static struct legacy_probe probe_list[NR_HOST];
 static struct legacy_data legacy_data[NR_HOST];
 static struct ata_host *legacy_host[NR_HOST];
-static int nr_legacy_host;
-
 
 static int probe_all;          /* Set to check all ISA port ranges */
 static int ht6560a;            /* HT 6560A on primary 1, second 2, both 3 */
@@ -1239,9 +1237,11 @@ static __exit void legacy_exit(void)
 {
        int i;
 
-       for (i = 0; i < nr_legacy_host; i++) {
+       for (i = 0; i < NR_HOST; i++) {
                struct legacy_data *ld = &legacy_data[i];
-               ata_host_detach(legacy_host[i]);
+
+               if (legacy_host[i])
+                       ata_host_detach(legacy_host[i]);
                platform_device_unregister(ld->platform_dev);
        }
 }