diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2011-05-02 02:49:33 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-04 05:46:01 +0200 |
| commit | d4a3b10c16a1bdb09483233bd7aeac684ccc160a (patch) | |
| tree | 025bda468b9857e67a093204dc467fc5a3570d09 /drivers/gpu/vga/vga_switcheroo.c | |
| parent | drm/radeon/kms: fix up r1xx-rs4xx i2c buses (diff) | |
| download | linux-d4a3b10c16a1bdb09483233bd7aeac684ccc160a.tar.xz linux-d4a3b10c16a1bdb09483233bd7aeac684ccc160a.zip | |
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 <alex.williamson@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/vga/vga_switcheroo.c')
| -rw-r--r-- | drivers/gpu/vga/vga_switcheroo.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index e01cacba685f..f0f244d29438 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); |