aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-08-07 15:47:30 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-10 16:27:51 -0400
commitc6333cc65d12fddf9cf79de3950b65bc142784e1 (patch)
treeb7348319d5d2dd37a5d345306e839ccf5bf0100b
parentd15684228a1f82555fcd3c5fcd86a0884bad29e3 (diff)
misc: pti, pci drvdata cannot be NULL in ->remove
As we set drvdata unconditionally in ->probe, we need not check if it is NULL. Let us remove the check. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: J Freyensee <james_p_freyensee@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/pti.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 5cb61f7e6f8a..88da085e450a 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -400,16 +400,13 @@ EXPORT_SYMBOL_GPL(pti_writedata);
400 */ 400 */
401static void __devexit pti_pci_remove(struct pci_dev *pdev) 401static void __devexit pti_pci_remove(struct pci_dev *pdev)
402{ 402{
403 struct pti_dev *drv_data; 403 struct pti_dev *drv_data = pci_get_drvdata(pdev);
404 404
405 drv_data = pci_get_drvdata(pdev); 405 pci_iounmap(pdev, drv_data->pti_ioaddr);
406 if (drv_data != NULL) { 406 pci_set_drvdata(pdev, NULL);
407 pci_iounmap(pdev, drv_data->pti_ioaddr); 407 kfree(drv_data);
408 pci_set_drvdata(pdev, NULL); 408 pci_release_region(pdev, 1);
409 kfree(drv_data); 409 pci_disable_device(pdev);
410 pci_release_region(pdev, 1);
411 pci_disable_device(pdev);
412 }
413} 410}
414 411
415/* 412/*