From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965452AbcIEQ5f (ORCPT ); Mon, 5 Sep 2016 12:57:35 -0400 Received: from mout.web.de ([212.227.15.14]:61934 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934622AbcIEQ50 (ORCPT ); Mon, 5 Sep 2016 12:57:26 -0400 Subject: [PATCH 10/21] ACPI-video: Return directly after a failed input_allocate_device() To: linux-acpi@vger.kernel.org, Hans de Goede , Len Brown , "Rafael J. Wysocki" , Zhang Rui References: <566ABCD9.1060404@users.sourceforge.net> <897ebf36-2fe5-e109-adf6-b81b6e863d9a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: <33f0a736-8682-1f0d-22cb-0ea6216cfb30@users.sourceforge.net> Date: Mon, 5 Sep 2016 18:57:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <897ebf36-2fe5-e109-adf6-b81b6e863d9a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:p7nn5gWodwmdugkemyCeY39FrQcy8Fe85tnSERkNiRUHJgUPyyz uAJGdDZSWg8Za0y2KpB1+KXRbwyBzr3WRekfFywDqBw1CsuSSYqEjVc+JcP2JzK5fWM/34B J2WrcIfPjauSnJm6VETqzkQVZRhywFqwfFjBuDaMokt8ePhkjiL9Hl66y0xG+UVZkQm5Kg4 HRA3/mullZZYK7xdB6edA== X-UI-Out-Filterresults: notjunk:1;V01:K0:UEqhhYU9giU=:GTvZ4IjFLx7zOdagqs+qKQ c+C3Rdsm4xr92ha94VaHn6pCi0wHoSFFoY8bZst0Ua3LWbWQwvhUyUydZ7coPfiIaAZ99Fq7T ZbWm0+VSuMhnwjLNyOqEVTcuj7L5+GXYm5rI7Y1tfjQkIM0/+97BBrdxuR4s8sP0THFmaKKRf EL0DEfBAoioXzxhWmDK6auvAnbsKbccipw6yN9+O74BRDQ7Snup40R35SZ6U0HaaOXu3wno2/ AjwnDCH/SpfqE0JnXKYkewwiacrgLs5qyzfgv/DXa1NKzMOtL8OnCykUMaU/pKwoYc734MqF/ JzMkN6CssvonbbpJGJhVeGkyZzcW64hF6JSPv1OLRt2n34CuqGO7jZ0szUAFtOt3KePuEtM3l LPqBC93xbXhtmgHL6ygriIhvKDK0FM/0oabXBZ+QPqyZx6fBHJ62NyxwEG7CLalsX1fsDL2S9 2XDnbJeAJ8/+gbrwf7Uk4Fz8PTS51YujucniCYMLRtPSmYrYxF0BbZTSQXq4jplXwqCBjg+Vx Dx638i35mge4xVR+z8PYYOoxzyMO2LgrJpb525hEiMWBDRyaxwmLUsTnspF3nwYadogoPVXTx 8n9UTFWYuA0KvjYWjVLRe+iCYKtgv9a03tx6OU363WxazHoJ/xt7LtMx5+xZjA9TJuRl6AY03 OuLSV12Oc7HWzWo8NfLIF4+hSDNNdXJzrFvYxnZ32+se/eBh/4yHzgkWJlwr8HE+A/0/n454y 3K/KXKMwtRKJZ9jnxRG1pw48nLnz8WD1iefxJHy2NYdw7M7tNro1KTTeQ/JiEPzpt7oewFpeR aDsSVX+ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 5 Sep 2016 15:46:19 +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 --- 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 74e5a40..6c871dd 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -1852,10 +1852,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) @@ -1895,7 +1893,6 @@ err_stop_dev: err_free_input: input_free_device(input); video->input = NULL; -out: return error; } -- 2.10.0