diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 04:17:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 04:17:45 +0200 |
| commit | d06838de4a015c7c4844ad3fcf63ad5e2c17b234 (patch) | |
| tree | ac8c5fa24458e7c6d33ceef89260a955a6ccaac8 /drivers/video/fbdev/via/viafbdev.c | |
| parent | staging: android: ion: Improve memory alloc style (diff) | |
| parent | Linux 4.12-rc6 (diff) | |
| download | linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.tar.xz linux-d06838de4a015c7c4844ad3fcf63ad5e2c17b234.zip | |
Merge 4.12-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/via/viafbdev.c')
| -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); |