diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-06-17 17:11:35 +0000 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@iguana.be> | 2016-07-17 21:01:43 +0200 |
| commit | db6d2d0e6d24176f524359bff2f209f0c8425496 (patch) | |
| tree | 10ac4d23bd5797551367a4c29a9b701ec6b65f5e /drivers/watchdog | |
| parent | watchdog: ziirave_wdt: Correct I2C device id to fix module autoloading. (diff) | |
| download | linux-dev-db6d2d0e6d24176f524359bff2f209f0c8425496.tar.xz linux-dev-db6d2d0e6d24176f524359bff2f209f0c8425496.zip | |
watchdog: pic32-wdt: Fix return value check in pic32_wdt_drv_probe()
In case of error, the function devm_kzalloc() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/pic32-wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/pic32-wdt.c b/drivers/watchdog/pic32-wdt.c index 6047aa89a4d3..2b7a2b22fcb2 100644 --- a/drivers/watchdog/pic32-wdt.c +++ b/drivers/watchdog/pic32-wdt.c @@ -174,8 +174,8 @@ static int pic32_wdt_drv_probe(struct platform_device *pdev) struct resource *mem; wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); - if (IS_ERR(wdt)) - return PTR_ERR(wdt); + if (!wdt) + return -ENOMEM; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); wdt->regs = devm_ioremap_resource(&pdev->dev, mem); |