diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-20 15:16:02 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-20 15:16:02 -0800 |
commit | 6e11617fcff3688f70650a3e40addb0043dda137 (patch) | |
tree | a24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/touchscreen/atmel-wm97xx.c | |
parent | 722c5ac708b4f5c1fcfad5fed4c95234c8b06590 (diff) | |
parent | a1b5359271e5c77d5ec8a575b379a6ba3e867097 (diff) | |
download | talos-op-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.gz talos-op-linux-6e11617fcff3688f70650a3e40addb0043dda137.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.11 merge window.
Diffstat (limited to 'drivers/input/touchscreen/atmel-wm97xx.c')
-rw-r--r-- | drivers/input/touchscreen/atmel-wm97xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index 7ec0421c0dd8..8cf0b2be2df4 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c @@ -339,10 +339,8 @@ static int __init atmel_wm97xx_probe(struct platform_device *pdev) int ret; atmel_wm97xx = kzalloc(sizeof(struct atmel_wm97xx), GFP_KERNEL); - if (!atmel_wm97xx) { - dev_dbg(&pdev->dev, "out of memory\n"); + if (!atmel_wm97xx) return -ENOMEM; - } atmel_wm97xx->wm = wm; atmel_wm97xx->regs = (void *)ATMEL_WM97XX_AC97C_IOMEM; |