| Message ID | 1393988899-30076-1-git-send-email-cheiny@synaptics.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 4 Mar 2014, Christopher Heiny wrote:
> Do not use kfree() on storage allocated with devm_kfree(),
I believe you meant devm_kmalloc() here.
On 03/05/2014 12:51 AM, Jiri Kosina wrote: > On Tue, 4 Mar 2014, Christopher Heiny wrote: > >> Do not use kfree() on storage allocated with devm_kfree(), > > I believe you meant devm_kmalloc() here. I've been trying for an hour to come up with some witty excuse for that brain fart, but came up with nothing but "D'oh! Thanks!" -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index 4406a7f..3552ffb 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -743,7 +743,6 @@ static int rmi_driver_remove(struct device *dev) gpio_free(pdata->attn_gpio); kfree(data->irq_status); - kfree(data); return 0; } @@ -942,7 +941,6 @@ err_destroy_functions: err_free_mem: if (data->gpio_held) gpio_free(pdata->attn_gpio); - kfree(data); return retval < 0 ? retval : 0; }
Do not use kfree() on storage allocated with devm_kfree(), eliminating kernel panics on device removal. I'm not sure how this eluded all the patching that's been going on over the past few weeks, but somehow it did. Reported-by: Courtney Cavin <courtney.cavin@sonymobile.com> Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reported-by: Andrew Duggan <aduggan@synaptics.com> Signed-off-by: Christopher Heiny <cheiny@synaptics.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: Linux Walleij <linus.walleij@linaro.org> Cc: David Herrmann <dh.herrmann@gmail.com> Cc: Jiri Kosina <jkosina@suse.cz> --- drivers/input/rmi4/rmi_driver.c | 2 -- 1 file changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html