Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fc7f629 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: watchdog-v2: handle error condition when getting resource"

parents 16beaa0d d79e5b49

arch/arm/mach-msm/msm_watchdog_v2.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -476,6 +476,8 @@ static int msm_wdog_dt_to_pdata(struct platform_device *pdev, 
	int ret;



	wdog_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!wdog_resource)

		return -ENODEV;

	pdata->size = resource_size(wdog_resource);

	pdata->phys_base = wdog_resource->start;

	if (unlikely(!(devm_request_region(&pdev->dev, pdata->phys_base,