Merge "lan78xx: Fix compilation failure for self assignment" into kernel.lnx.4.9.r27-rel (e9d96aa8) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/usb/lan78xx.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -868,12 +868,13 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset,
		ret = lan78xx_read_raw_otp(dev, 0, 1, &sig);

		if (ret == 0) {
		if (sig == OTP_INDICATOR_1)
		offset = offset;
		else if (sig == OTP_INDICATOR_2)
		if (sig != OTP_INDICATOR_1) {
		if (sig == OTP_INDICATOR_2)
		offset += 0x100;
		else
		ret = -EINVAL;
		}

		if (!ret)
		ret = lan78xx_read_raw_otp(dev, offset, length, data);
		}