Merge branch 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / misc / pch_phub.c

diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index a5925f7f17f6a564cab6296dd2333fb5ae08d92e..956597321d2a39e2599ac7eb19f7071df3b7945e 100644 (file)
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -636,6 +636,7 @@ static ssize_t store_pch_mac(struct device *dev, struct device_attribute *attr,
        u8 mac[ETH_ALEN];
        ssize_t rom_size;
        struct pch_phub_reg *chip = dev_get_drvdata(dev);
+       int ret;
 
        if (!mac_pton(buf, mac))
                return -EINVAL;
@@ -644,8 +645,10 @@ static ssize_t store_pch_mac(struct device *dev, struct device_attribute *attr,
        if (!chip->pch_phub_extrom_base_address)
                return -ENOMEM;
 
-       pch_phub_write_gbe_mac_addr(chip, mac);
+       ret = pch_phub_write_gbe_mac_addr(chip, mac);
        pci_unmap_rom(chip->pdev, chip->pch_phub_extrom_base_address);
+       if (ret)
+               return ret;
 
        return count;
 }