diff options
Diffstat (limited to 'drivers/gpu/vga/vga_switcheroo.c')
| -rw-r--r-- | drivers/gpu/vga/vga_switcheroo.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index e01cacba685..498b284e5ef 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -219,9 +219,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)  	int i;  	struct vga_switcheroo_client *active = NULL; -	if (new_client->active == true) -		return 0; -  	for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {  		if (vgasr_priv.clients[i].active == true) {  			active = &vgasr_priv.clients[i]; @@ -372,6 +369,9 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,  		goto out;  	} +	if (client->active == true) +		goto out; +  	/* okay we want a switch - test if devices are willing to switch */  	can_switch = true;  	for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {  |