diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-21 16:01:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-21 16:01:02 -0700 |
| commit | 845d46caf1406b5ff684f6c5d1ede1befa7123fa (patch) | |
| tree | 34bf14ea34acf0be4f32314a01fa62e95563d165 | |
| parent | d15694a921227a4501b34325645ceaf0e4cfd3e8 (diff) | |
| download | patches-845d46caf1406b5ff684f6c5d1ede1befa7123fa.tar.gz | |
another compiler warning fix for staging
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | staging/staging-ppc-acpi-handle-errors-from-input_register_device.patch | 44 |
2 files changed, 45 insertions, 0 deletions
@@ -112,6 +112,7 @@ staging/staging-w35und-module-init-cleanup.patch staging/staging-wbusb-fix-a-bunch-of-compiler-warnings.patch staging/staging-me4000-remove-some-compiler-warnings.patch staging/staging-usbip-fix-build-warning-on-64bit-kernels.patch +staging/staging-ppc-acpi-handle-errors-from-input_register_device.patch # can not even compile :( #staging/usb-add-princeton-instruments-usb-camera-driver.patch diff --git a/staging/staging-ppc-acpi-handle-errors-from-input_register_device.patch b/staging/staging-ppc-acpi-handle-errors-from-input_register_device.patch new file mode 100644 index 00000000000000..836f09151152c4 --- /dev/null +++ b/staging/staging-ppc-acpi-handle-errors-from-input_register_device.patch @@ -0,0 +1,44 @@ +From jrm8005@gmail.com Tue Oct 21 15:59:50 2008 +From: "J.R. Mauro" <jrm8005@gmail.com> +Date: Mon, 20 Oct 2008 20:36:34 -0400 +Subject: Staging: ppc-acpi: Handle errors from input_register_device() +To: Greg KH <gregkh@suse.de> +Message-ID: <20081021003634.GA1267@localhost> +Content-Disposition: inline + +From: J.R. Mauro <jrm8005@gmail.com> + +Handle errors from input_register_device() + +Signed-off by: J.R. Mauro <jrm8005@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/pcc-acpi/pcc-acpi.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/staging/pcc-acpi/pcc-acpi.c ++++ b/drivers/staging/pcc-acpi/pcc-acpi.c +@@ -842,6 +842,7 @@ static int acpi_pcc_init_input(struct ac + { + struct input_dev *hotk_input_dev; + struct pcc_keyinput *pcc_keyinput; ++ int ret; + + ACPI_FUNCTION_TRACE("acpi_pcc_init_input"); + +@@ -885,8 +886,13 @@ static int acpi_pcc_init_input(struct ac + + hotkey->input_dev = hotk_input_dev; + ++ ret = input_register_device(hotk_input_dev); + +- input_register_device(hotk_input_dev); ++ if (ret) { ++ input_free_device(hotk_input_dev); ++ kfree(pcc_keyinput); ++ return ret; ++ } + + return_VALUE(0); + } |