Merge tag 'v3.13-rc3' into for-linus

Merging with the mainline to sync up on changes to serio core.

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 0346d87c5fed..6b3bf9ab051d 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -153,7 +153,6 @@ error_ioremap:
 error_heartbeat:
         ibmasm_event_buffer_exit(sp);
 error_eventbuffer:
-        pci_set_drvdata(pdev, NULL);
         kfree(sp);
 error_kmalloc:
         pci_release_regions(pdev);
@@ -165,7 +164,7 @@ error_resources:
 
 static void ibmasm_remove_one(struct pci_dev *pdev)
 {
-        struct service_processor *sp = (struct service_processor *)pci_get_drvdata(pdev);
+        struct service_processor *sp = pci_get_drvdata(pdev);
 
         dbg("Unregistering UART\n");
         ibmasm_unregister_uart(sp);
@@ -182,7 +181,6 @@ static void ibmasm_remove_one(struct pci_dev *pdev)
         ibmasm_free_remote_input_dev(sp);
         iounmap(sp->base_address);
         ibmasm_event_buffer_exit(sp);
-        pci_set_drvdata(pdev, NULL);
         kfree(sp);
         pci_release_regions(pdev);
         pci_disable_device(pdev);