[PATCH v2 4/9] ACPI-video: Return directly after a failed input_allocate_device()

From: SF Markus Elfring
Date: Wed Aug 09 2017 - 11:40:21 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 9 Aug 2017 15:15:16 +0200

* Return directly after a call of the function "input_allocate_device"
failed at the beginning.

* Delete the jump label "out" which became unnecessary with
this refactoring.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/acpi_video.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index f83ece9c830c..09ea1f115f55 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -1903,10 +1903,8 @@ static int acpi_video_bus_add_notify_handler(struct acpi_video_bus *video)
int error;

video->input = input = input_allocate_device();
- if (!input) {
- error = -ENOMEM;
- goto out;
- }
+ if (!input)
+ return -ENOMEM;

error = acpi_video_bus_start_devices(video);
if (error)
@@ -1946,7 +1944,6 @@ static int acpi_video_bus_add_notify_handler(struct acpi_video_bus *video)
err_free_input:
input_free_device(input);
video->input = NULL;
-out:
return error;
}

--
2.13.4