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

Commit 44daa529 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "esoc: Add check for possible null pointer returns" into msm-4.9

parents 4b6f007a f7fdd243

drivers/esoc/esoc_client.c

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

/* Copyright (c) 2014-2016, 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
@@ -48,6 +48,8 @@ struct esoc_desc *devm_register_esoc_client(struct device *dev, 


	for (index = 0;; index++) {

		esoc_prop = kasprintf(GFP_KERNEL, "esoc-%d", index);

		if (IS_ERR_OR_NULL(esoc_prop))

			return ERR_PTR(-ENOMEM);

		parp = of_get_property(np, esoc_prop, NULL);

		if (parp == NULL) {

			dev_err(dev, "esoc device not present\n");