mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-12 08:09:56 +00:00
Input: stmpe-ts - return -ENOMEM when memory allocation fails
Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
843cbfa74f
commit
cdd194779b
@ -268,7 +268,7 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
|
||||
struct stmpe_touch *ts;
|
||||
struct input_dev *idev;
|
||||
struct stmpe_ts_platform_data *ts_pdata = NULL;
|
||||
int ret = 0;
|
||||
int ret;
|
||||
int ts_irq;
|
||||
|
||||
ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
|
||||
@ -276,12 +276,16 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
|
||||
return ts_irq;
|
||||
|
||||
ts = kzalloc(sizeof(*ts), GFP_KERNEL);
|
||||
if (!ts)
|
||||
if (!ts) {
|
||||
ret = -ENOMEM;
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
idev = input_allocate_device();
|
||||
if (!idev)
|
||||
if (!idev) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free_ts;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, ts);
|
||||
ts->stmpe = stmpe;
|
||||
|
Loading…
x
Reference in New Issue
Block a user