From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 2 Aug 2018 08:27:21 +0000 (+0300)
Subject: eeprom: idt_89hpesx: clean up an error pointer vs NULL inconsistency
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c01513b4b29953e6ba8a8d8de77fb5ca2f01c48f;p=openwrt%2Fstaging%2Fblogic.git

eeprom: idt_89hpesx: clean up an error pointer vs NULL inconsistency

We check for IS_ERR_OR_NULL() here, but later we check the same thing
for NULL only.  It turns out that it can only be NULL so we can make the
checking consistent by removing the ERR_PTR stuff.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/eeprom/idt_89hpesx.c b/drivers/misc/eeprom/idt_89hpesx.c
index 119eb05a5a91..8a4659518c33 100644
--- a/drivers/misc/eeprom/idt_89hpesx.c
+++ b/drivers/misc/eeprom/idt_89hpesx.c
@@ -1128,7 +1128,7 @@ static void idt_get_fw_data(struct idt_89hpesx_dev *pdev)
 
 	device_for_each_child_node(dev, fwnode) {
 		ee_id = idt_ee_match_id(fwnode);
-		if (IS_ERR_OR_NULL(ee_id)) {
+		if (!ee_id) {
 			dev_warn(dev, "Skip unsupported EEPROM device");
 			continue;
 		} else