Snap for 10500318 from 76474e604c to android13-5.15-keystone-qcom-release

Change-Id: Ife6c540743ebb95c3c57a93e55ffc66ba70350a3
This commit is contained in:
Android Build Coastguard Worker
2023-07-15 00:00:16 +00:00
3 changed files with 4 additions and 6 deletions

View File

@@ -163088,7 +163088,6 @@
</abi-instr> </abi-instr>
</abi-corpus> </abi-corpus>
</abi-corpus-group> </abi-corpus-group>
<!-- <!--
libabigail: abidw: 2.1.0SOONG BUILD NUMBER PLACEHOLDER libabigail: abidw: 2.1.0SOONG BUILD NUMBER PLACEHOLDER
--> -->

View File

@@ -1042,7 +1042,7 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
reg &= ~DWC3_DALEPENA_EP(dep->number); reg &= ~DWC3_DALEPENA_EP(dep->number);
dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
dwc3_remove_requests(dwc, dep, -ECONNRESET); dwc3_remove_requests(dwc, dep, -ESHUTDOWN);
dep->stream_capable = false; dep->stream_capable = false;
dep->type = 0; dep->type = 0;

View File

@@ -7,10 +7,9 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/rtmutex.h>
#include "internal.h" #include "internal.h"
static DEFINE_RT_MUTEX(pmsg_lock); static DEFINE_MUTEX(pmsg_lock);
static ssize_t write_pmsg(struct file *file, const char __user *buf, static ssize_t write_pmsg(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
@@ -29,9 +28,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,
if (!access_ok(buf, count)) if (!access_ok(buf, count))
return -EFAULT; return -EFAULT;
rt_mutex_lock(&pmsg_lock); mutex_lock(&pmsg_lock);
ret = psinfo->write_user(&record, buf); ret = psinfo->write_user(&record, buf);
rt_mutex_unlock(&pmsg_lock); mutex_unlock(&pmsg_lock);
return ret ? ret : count; return ret ? ret : count;
} }