Prev: acer-wmi: fix memory leaks in WMID_set_capabilities and get_wmid_devices
Next: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
From: Thomas Renninger on 6 Jul 2010 04:00 Hi, it's incredible how much cleanups and fixes you find in this handful of drivers... It's very much appreciated! On Tuesday 06 July 2010 04:30:26 Axel Lin wrote: > Add error checking and return -ENOMEM if input_allocate_device() fail. > > Signed-off-by: Axel Lin <axel.lin(a)gmail.com> > --- > drivers/platform/x86/hp-wmi.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c > index 51c07a0..c508e20 100644 > --- a/drivers/platform/x86/hp-wmi.c > +++ b/drivers/platform/x86/hp-wmi.c > @@ -402,6 +402,8 @@ static int __init hp_wmi_input_setup(void) > int err; > > hp_wmi_input_dev = input_allocate_device(); > + if (!hp_wmi_input_dev) > + return -ENOMEM; > > hp_wmi_input_dev->name = "HP WMI hotkeys"; > hp_wmi_input_dev->phys = "wmi/input0"; But also hp_wmi_input_setup() call should get checked and if it fails, the previous wmi_install_notify_handler() must get uninstalled again. Hm, probably the whole driver shouldn't load then and the error code from hp_wmi_input_setup() can be returned in hp_wmi_init(void). Do you mind to incorporate above if you agree. Thanks, Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Thomas Renninger on 6 Jul 2010 04:20
On Tuesday 06 July 2010 10:07:49 Axel Lin wrote: > hi Thomas, > 2010/7/6 Thomas Renninger <trenn(a)suse.de>: .... > > Do you mind to incorporate above if you agree. > > Checking hp_wmi_input_setup() is already done in my previous patch. > ( which is already merged in platform-driver-x86 tree. .... Perfect! Acked-by: Thomas Renninger <trenn(a)suse.de> Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |