diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 10:16:07 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 10:16:07 +0800 |
commit | 571949a40a9c00fdaa3d0256cf43c9e0c25ff2d1 (patch) | |
tree | 7edcc302961329a7a3c4d2942f6c2300b4765345 /drivers/video/fbdev/via | |
parent | 21bdb3b071a7c6f34999545092bf15480ab95f49 (diff) | |
parent | 41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff) | |
download | linux-571949a40a9c00fdaa3d0256cf43c9e0c25ff2d1.tar.bz2 |
Merge 4.12-rc6 into usb-next
We want the USB fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/via')
-rw-r--r-- | drivers/video/fbdev/via/viafbdev.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/via/viafbdev.c index f9718f012aae..badee04ef496 100644 --- a/drivers/video/fbdev/via/viafbdev.c +++ b/drivers/video/fbdev/via/viafbdev.c @@ -1630,16 +1630,14 @@ static void viafb_init_proc(struct viafb_shared *shared) } static void viafb_remove_proc(struct viafb_shared *shared) { - struct proc_dir_entry *viafb_entry = shared->proc_entry, - *iga1_entry = shared->iga1_proc_entry, - *iga2_entry = shared->iga2_proc_entry; + struct proc_dir_entry *viafb_entry = shared->proc_entry; if (!viafb_entry) return; - remove_proc_entry("output_devices", iga2_entry); + remove_proc_entry("output_devices", shared->iga2_proc_entry); remove_proc_entry("iga2", viafb_entry); - remove_proc_entry("output_devices", iga1_entry); + remove_proc_entry("output_devices", shared->iga1_proc_entry); remove_proc_entry("iga1", viafb_entry); remove_proc_entry("supported_output_devices", viafb_entry); |