Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[platform/kernel/linux-rpi.git] / drivers / phy / tegra / xusb-tegra186.c

diff --git a/drivers/phy/tegra/xusb-tegra186.c b/drivers/phy/tegra/xusb-tegra186.c
index 5abdf81..0996ede 100644 (file)
--- a/drivers/phy/tegra/xusb-tegra186.c
+++ b/drivers/phy/tegra/xusb-tegra186.c
@@ -1384,12 +1384,9 @@ tegra186_xusb_read_fuse_calibration(struct tegra186_xusb_padctl *padctl)
                return -ENOMEM;
 
        err = tegra_fuse_readl(TEGRA_FUSE_SKU_CALIB_0, &value);
-       if (err) {
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "failed to read calibration fuse: %d\n",
-                               err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "failed to read calibration fuse\n");
 
        dev_dbg(dev, "FUSE_USB_CALIB_0 %#x\n", value);