From d06fc9378006ff9db1ec98d385bad4aba3985348 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 7 Aug 2012 21:47:30 +0200
Subject: [PATCH] --- yaml --- r: 325637 b: refs/heads/master c:
 c6333cc65d12fddf9cf79de3950b65bc142784e1 h: refs/heads/master i:   325635:
 f2fa88e8845f52dde9827f65b7422196683c5817 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/misc/pti.c | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 34fe898c33e1..4fe3e8849d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d15684228a1f82555fcd3c5fcd86a0884bad29e3
+refs/heads/master: c6333cc65d12fddf9cf79de3950b65bc142784e1
diff --git a/trunk/drivers/misc/pti.c b/trunk/drivers/misc/pti.c
index 5cb61f7e6f8a..88da085e450a 100644
--- a/trunk/drivers/misc/pti.c
+++ b/trunk/drivers/misc/pti.c
@@ -400,16 +400,13 @@ EXPORT_SYMBOL_GPL(pti_writedata);
  */
 static void __devexit pti_pci_remove(struct pci_dev *pdev)
 {
-	struct pti_dev *drv_data;
+	struct pti_dev *drv_data = pci_get_drvdata(pdev);
 
-	drv_data = pci_get_drvdata(pdev);
-	if (drv_data != NULL) {
-		pci_iounmap(pdev, drv_data->pti_ioaddr);
-		pci_set_drvdata(pdev, NULL);
-		kfree(drv_data);
-		pci_release_region(pdev, 1);
-		pci_disable_device(pdev);
-	}
+	pci_iounmap(pdev, drv_data->pti_ioaddr);
+	pci_set_drvdata(pdev, NULL);
+	kfree(drv_data);
+	pci_release_region(pdev, 1);
+	pci_disable_device(pdev);
 }
 
 /*