| From 5eddda75f84cf18da7ef88e7e7aa347053c9cbe2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 22 Nov 2020 13:49:37 +0800 |
| Subject: platform/x86: toshiba_acpi: Fix the wrong variable assignment |
| |
| From: Kaixu Xia <kaixuxia@tencent.com> |
| |
| [ Upstream commit 2a72c46ac4d665614faa25e267c3fb27fb729ed7 ] |
| |
| The commit 78429e55e4057 ("platform/x86: toshiba_acpi: Clean up |
| variable declaration") cleans up variable declaration in |
| video_proc_write(). Seems it does the variable assignment in the |
| wrong place, this results in dead code and changes the source code |
| logic. Fix it by doing the assignment at the beginning of the funciton. |
| |
| Fixes: 78429e55e4057 ("platform/x86: toshiba_acpi: Clean up variable declaration") |
| Reported-by: Tosk Robot <tencent_os_robot@tencent.com> |
| Signed-off-by: Kaixu Xia <kaixuxia@tencent.com> |
| Link: https://lore.kernel.org/r/1606024177-16481-1-git-send-email-kaixuxia@tencent.com |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/platform/x86/toshiba_acpi.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c |
| index a1e6569427c34..71a969fc3b206 100644 |
| --- a/drivers/platform/x86/toshiba_acpi.c |
| +++ b/drivers/platform/x86/toshiba_acpi.c |
| @@ -1485,7 +1485,7 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf, |
| struct toshiba_acpi_dev *dev = PDE_DATA(file_inode(file)); |
| char *buffer; |
| char *cmd; |
| - int lcd_out, crt_out, tv_out; |
| + int lcd_out = -1, crt_out = -1, tv_out = -1; |
| int remain = count; |
| int value; |
| int ret; |
| @@ -1517,7 +1517,6 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf, |
| |
| kfree(cmd); |
| |
| - lcd_out = crt_out = tv_out = -1; |
| ret = get_video_status(dev, &video_out); |
| if (!ret) { |
| unsigned int new_video_out = video_out; |
| -- |
| 2.27.0 |
| |