From: Alex Williamson Date: Mon, 2 May 2011 00:49:33 +0000 (-0600) Subject: vga_switcheroo: Remove unbalanced pci_enable_device X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4a3b10c16a1bdb09483233bd7aeac684ccc160a;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git vga_switcheroo: Remove unbalanced pci_enable_device This is unbalanced and probably more fitting for the client to take care of. Remove it. Signed-off-by: Alex Williamson Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index e01cacba685..f0f244d2943 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -215,7 +215,6 @@ static int vga_switchoff(struct vga_switcheroo_client *client) /* stage one happens before delay */ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) { - int ret; int i; struct vga_switcheroo_client *active = NULL; @@ -231,11 +230,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) if (!active) return 0; - /* power up the first device */ - ret = pci_enable_device(new_client->pdev); - if (ret) - return ret; - if (new_client->pwr_state == VGA_SWITCHEROO_OFF) vga_switchon(new_client);