1 files changed, 33 insertions, 29 deletions

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index c72f1c0b5e63..111d956d8e7d 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -465,31 +465,29 @@ static void vga_arbiter_check_bridge_sharing(struct vga_device *vgadev)
         while (new_bus) {
                 new_bridge = new_bus->self;
 
-                if (new_bridge) {
-                        /* go through list of devices already registered */
-                        list_for_each_entry(same_bridge_vgadev, &vga_list, list) {
-                                bus = same_bridge_vgadev->pdev->bus;
-                                bridge = bus->self;
-
-                                /* see if the share a bridge with this device */
-                                if (new_bridge == bridge) {
-                                        /* if their direct parent bridge is the same
-                                           as any bridge of this device then it can't be used
-                                           for that device */
-                                        same_bridge_vgadev->bridge_has_one_vga = false;
-                                }
+                /* go through list of devices already registered */
+                list_for_each_entry(same_bridge_vgadev, &vga_list, list) {
+                        bus = same_bridge_vgadev->pdev->bus;
+                        bridge = bus->self;
+
+                        /* see if the share a bridge with this device */
+                        if (new_bridge == bridge) {
+                                /* if their direct parent bridge is the same
+                                   as any bridge of this device then it can't be used
+                                   for that device */
+                                same_bridge_vgadev->bridge_has_one_vga = false;
+                        }
 
-                                /* now iterate the previous devices bridge hierarchy */
-                                /* if the new devices parent bridge is in the other devices
-                                   hierarchy then we can't use it to control this device */
-                                while (bus) {
-                                        bridge = bus->self;
-                                        if (bridge) {
-                                                if (bridge == vgadev->pdev->bus->self)
-                                                        vgadev->bridge_has_one_vga = false;
-                                        }
-                                        bus = bus->parent;
+                        /* now iterate the previous devices bridge hierarchy */
+                        /* if the new devices parent bridge is in the other devices
+                           hierarchy then we can't use it to control this device */
+                        while (bus) {
+                                bridge = bus->self;
+                                if (bridge) {
+                                        if (bridge == vgadev->pdev->bus->self)
+                                                vgadev->bridge_has_one_vga = false;
                                 }
+                                bus = bus->parent;
                         }
                 }
                 new_bus = new_bus->parent;
@@ -993,14 +991,20 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                                 uc = &priv->cards[i];
                 }
 
-                if (!uc)
-                        return -EINVAL;
+                if (!uc) {
+                        ret_val = -EINVAL;
+                        goto done;
+                }
 
-                if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0)
-                        return -EINVAL;
+                if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) {
+                        ret_val = -EINVAL;
+                        goto done;
+                }
 
-                if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0)
-                        return -EINVAL;
+                if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) {
+                        ret_val = -EINVAL;
+                        goto done;
+                }
 
                 vga_put(pdev, io_state);