diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2011-05-01 20:49:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-03 23:46:01 -0400 |
| commit | d4a3b10c16a1bdb09483233bd7aeac684ccc160a (patch) | |
| tree | 025bda468b9857e67a093204dc467fc5a3570d09 /drivers/gpu/vga | |
| parent | 508c8d60bd08640db39146edbbfdbf01a802163d (diff) | |
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')
| -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) | |||
| 215 | /* stage one happens before delay */ | 215 | /* stage one happens before delay */ |
| 216 | static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) | 216 | static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) |
| 217 | { | 217 | { |
| 218 | int ret; | ||
| 219 | int i; | 218 | int i; |
| 220 | struct vga_switcheroo_client *active = NULL; | 219 | struct vga_switcheroo_client *active = NULL; |
| 221 | 220 | ||
| @@ -231,11 +230,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) | |||
| 231 | if (!active) | 230 | if (!active) |
| 232 | return 0; | 231 | return 0; |
| 233 | 232 | ||
| 234 | /* power up the first device */ | ||
| 235 | ret = pci_enable_device(new_client->pdev); | ||
| 236 | if (ret) | ||
| 237 | return ret; | ||
| 238 | |||
| 239 | if (new_client->pwr_state == VGA_SWITCHEROO_OFF) | 233 | if (new_client->pwr_state == VGA_SWITCHEROO_OFF) |
| 240 | vga_switchon(new_client); | 234 | vga_switchon(new_client); |
| 241 | 235 | ||