LTS: Merge android-4.14-stable (4.14.271) into android-msm-pixel-4.14
Merge android-4.14-stable common kernel (4.14.271) into C2F2/S5 TM kernel.
Bug: 225082527
Test: Manual testing, SST, vts/vts-kernel, pts/base, pts/postsubmit-long
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I0bc6ef95596cf66d88ca2401804716b975642652
diff --git a/arch/arm64/configs/floral_defconfig b/arch/arm64/configs/floral_defconfig
index d18a14a..9d4c2c0 100644
--- a/arch/arm64/configs/floral_defconfig
+++ b/arch/arm64/configs/floral_defconfig
@@ -223,6 +223,7 @@
CONFIG_L2TP_IP=y
CONFIG_L2TP_ETH=y
CONFIG_BRIDGE=y
+CONFIG_VLAN_8021Q=y
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_HTB=y
CONFIG_NET_SCH_PRIO=y
diff --git a/drivers/mfd/abc-pcie.c b/drivers/mfd/abc-pcie.c
index c085722..fd9ac1c 100644
--- a/drivers/mfd/abc-pcie.c
+++ b/drivers/mfd/abc-pcie.c
@@ -1895,6 +1895,9 @@
dev_info(dev, "%s: enter\n", __func__);
+ if (!abc_dev)
+ return -ENOTCONN;
+
/*
* If PCIe link is not enabled, this handler should not have been
* called.
@@ -1936,6 +1939,9 @@
dev_info(dev, "%s: enter\n", __func__);
+ if (!abc_dev)
+ return -ENOTCONN;
+
/*
* If PCIe link is not enabled, this handler should not have been
* called.
@@ -2003,6 +2009,9 @@
"%s: ab_ready is high; PCIe link is enabled by host\n",
__func__);
+ if (!abc_dev)
+ return -ENOTCONN;
+
/*
* Set link_state to active.
* If PCIe link is already enabled, there is no need to broadcast a
@@ -2032,6 +2041,9 @@
"%s: PCIe link will be disabled by host\n",
__func__);
+ if (!abc_dev)
+ return -ENOTCONN;
+
/*
* If PCIe link is already disabled, there is no need to broadcast a
* PRE_DISABLE event. This situation is not supposed to happen.
@@ -2069,6 +2081,9 @@
"%s: PCIe link unexpectedly went down\n",
__func__);
+ if (!abc_dev)
+ return -ENOTCONN;
+
/*
* Unlike abc_pcie_pre_disable_handler, here link_state is set to
* inactive as soon as possible before notifying subscribers.
@@ -2661,7 +2676,9 @@
pci_set_drvdata(pdev, NULL);
pci_release_regions(pdev);
pci_disable_device(pdev);
+ ab_sm_unregister_mfd_ops();
kfree(abc_dev);
+ abc_dev = NULL;
kfree(abc);
}
diff --git a/drivers/power/supply/google/google_battery.c b/drivers/power/supply/google/google_battery.c
index 99b6e6d..0a306df 100644
--- a/drivers/power/supply/google/google_battery.c
+++ b/drivers/power/supply/google/google_battery.c
@@ -5891,9 +5891,6 @@
dump_ssoc_state(&batt_drv->ssoc_state, batt_drv->ssoc_log);
ret = gbatt_restore_capacity(batt_drv);
- if (ret == -EPROBE_DEFER) /* wait gbms_storage_init_done */
- goto retry_init_work;
-
if (ret < 0)
pr_warn("unable to restore capacity, ret=%d\n", ret);
else
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index 43dfa92..1679ac6 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -4312,6 +4312,9 @@
mutex_init(&mdwc->suspend_resume_mutex);
+ /* set the initial value */
+ mdwc->usb_data_enabled = true;
+
if (of_property_read_bool(node, "extcon")) {
ret = dwc3_msm_extcon_register(mdwc);
if (ret)
@@ -4371,8 +4374,6 @@
dwc3_ext_event_notify(mdwc);
}
- /* set the initial value */
- mdwc->usb_data_enabled = true;
device_create_file(&pdev->dev, &dev_attr_mode);
device_create_file(&pdev->dev, &dev_attr_speed);
device_create_file(&pdev->dev, &dev_attr_usb_compliance_mode);
diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index b423725..b6777b5 100644
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -651,7 +651,7 @@
BufOffset = le32_to_cpu(buf->InformationBufferOffset);
if ((BufLength > RNDIS_MAX_TOTAL_SIZE) ||
(BufOffset + 8 >= RNDIS_MAX_TOTAL_SIZE))
- return -EINVAL;
+ return -EINVAL;
r = rndis_add_response(params, sizeof(rndis_set_cmplt_type));
if (!r)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 08bda8f..6b27930 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -567,8 +567,7 @@
va_list args;
int len;
- if (WARN(!buf || offset_in_page(buf),
- "invalid sysfs_emit: buf:%p\n", buf))
+ if (WARN(!buf, "invalid sysfs_emit: buf:%p\n", buf))
return 0;
va_start(args, fmt);
