From: Sameer Wadgaonkar <sameer.wadgaon...@unisys.com>

Removed checks for dev->visorchannel in visorbus_release_device()
and visorbus_remove_instance() since it is also checked in the
visorchannel_destroy() function.

Signed-off-by: Sameer Wadgaonkar <sameer.wadgaon...@unisys.com>
Signed-off-by: David Kershner <david.kersh...@unisys.com>
Reviewed-by: David Binder <david.bin...@unisys.com>
---
 drivers/staging/unisys/visorbus/visorbus_main.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c 
b/drivers/staging/unisys/visorbus/visorbus_main.c
index 1a212ec..bdebd58 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -156,10 +156,7 @@ visorbus_release_device(struct device *xdev)
 {
        struct visor_device *dev = to_visor_device(xdev);
 
-       if (dev->visorchannel) {
-               visorchannel_destroy(dev->visorchannel);
-               dev->visorchannel = NULL;
-       }
+       visorchannel_destroy(dev->visorchannel);
        kfree(dev);
 }
 
@@ -1058,10 +1055,7 @@ visorbus_remove_instance(struct visor_device *dev)
         * successfully been able to trace thru the code to see where/how
         * release() gets called.  But I know it does.
         */
-       if (dev->visorchannel) {
-               visorchannel_destroy(dev->visorchannel);
-               dev->visorchannel = NULL;
-       }
+       visorchannel_destroy(dev->visorchannel);
        kfree(dev->vbus_hdr_info);
        list_del(&dev->list_all);
        device_unregister(&dev->device);
-- 
git-series 0.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to