diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-06-17 13:11:35 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-07-17 15:01:43 -0400 |
| commit | db6d2d0e6d24176f524359bff2f209f0c8425496 (patch) | |
| tree | 10ac4d23bd5797551367a4c29a9b701ec6b65f5e | |
| parent | 22daf7a71683185db6bcb089e006be5f99dddf9c (diff) | |
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>
| -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) | |||
| 174 | struct resource *mem; | 174 | struct resource *mem; |
| 175 | 175 | ||
| 176 | wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); | 176 | wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL); |
| 177 | if (IS_ERR(wdt)) | 177 | if (!wdt) |
| 178 | return PTR_ERR(wdt); | 178 | return -ENOMEM; |
| 179 | 179 | ||
| 180 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 180 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 181 | wdt->regs = devm_ioremap_resource(&pdev->dev, mem); | 181 | wdt->regs = devm_ioremap_resource(&pdev->dev, mem); |