tpm_tis: fix the error handling of init_tis()
authorWei Yongjun <weiyongjun1@huawei.com>
Tue, 7 Feb 2017 15:51:47 +0000 (15:51 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 12 Mar 2017 05:41:43 +0000 (06:41 +0100)
commit 5939eaf4f9d432586dd2cdeea778506471e8088e upstream.

Add the missing platform_driver_unregister() and remove the duplicate
platform_device_unregister(force_pdev) in the error handling case.

Fixes: 00194826e6be ("tpm_tis: Clean up the force=1 module parameter")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/tpm/tpm_tis.c

index eaf5730..8022bea 100644 (file)
@@ -421,7 +421,7 @@ err_pnp:
        acpi_bus_unregister_driver(&tis_acpi_driver);
 err_acpi:
 #endif
-       platform_device_unregister(force_pdev);
+       platform_driver_unregister(&tis_drv);
 err_platform:
        if (force_pdev)
                platform_device_unregister(force_pdev);