lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vga_switcheroo: Remove unbalanced pci_enable_device

Browse Source 
This is unbalanced and probably more fitting for the client
to take care of.  Remove it.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Alex Williamson
2011-05-01 18:49:33 -06:00
committed by Dave Airlie
parent 508c8d60bd
commit d4a3b10c16
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/vga/vga_switcheroo.c
View File

@@ -215,7 +215,6 @@ static int vga_switchoff(struct vga_switcheroo_client *client)
/* stage one happens before delay */ /* stage one happens before delay */
static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
{ {
int ret;
int i; int i;
struct vga_switcheroo_client *active = NULL; struct vga_switcheroo_client *active = NULL;
@@ -231,11 +230,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
if (!active) if (!active)
return 0; 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) if (new_client->pwr_state == VGA_SWITCHEROO_OFF)
vga_switchon(new_client); vga_switchon(new_client);