]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drivers/misc/hpilo: Correct panic when an AUX iLO is detected
authorMark Rusk <Mark.Rusk@hp.com>
Wed, 14 Aug 2013 20:30:01 +0000 (15:30 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 8 Sep 2013 05:09:59 +0000 (22:09 -0700)
commit eefbc594abbb1b7e6e7eeadb65ae7c7538474210 upstream.

 Using an uninitialized variable 'devnum' after 'goto out;' was causing
 panic.  Just go ahead and return, we need to ignore AUX iLO devs.

 Oops: 0002 [#1] SMP
   .
   .
   .
 RIP  [<ffffffffa033e270>] ilo_probe+0xec/0xe7c [hpilo]

Signed-off-by: Mark Rusk <mark.rusk@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/hpilo.c

index 621c7a3733901abc6cf7da5170f1380a3a376ab9..b83e3ca12a419349690d1ab2a790124f2c1e0e93 100644 (file)
@@ -759,7 +759,7 @@ static int ilo_probe(struct pci_dev *pdev,
 
        /* Ignore subsystem_device = 0x1979 (set by BIOS)  */
        if (pdev->subsystem_device == 0x1979)
-               goto out;
+               return 0;
 
        if (max_ccb > MAX_CCB)
                max_ccb = MAX_CCB;
@@ -899,7 +899,7 @@ static void __exit ilo_exit(void)
        class_destroy(ilo_class);
 }
 
-MODULE_VERSION("1.4");
+MODULE_VERSION("1.4.1");
 MODULE_ALIAS(ILO_NAME);
 MODULE_DESCRIPTION(ILO_NAME);
 MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>");