mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Revert "penang: device suspend tests fail"
This reverts commit 485bfce748.
Reason for revert: Conflicts with upstream commits.
Change-Id: I5ca8bffe070c918271543678401d2d9ab25e4897
This commit is contained in:
parent
4267e716d3
commit
403aa4c00b
1 changed files with 12 additions and 5 deletions
|
|
@ -192,6 +192,7 @@ struct qrtr_node {
|
|||
struct wakeup_source *ws;
|
||||
void *ilc;
|
||||
|
||||
u32 nonwake_svc[MAX_NON_WAKE_SVC_LEN];
|
||||
struct qrtr_array no_wake_svc;
|
||||
};
|
||||
|
||||
|
|
@ -942,11 +943,15 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
|
|||
|
||||
if (node->nid == 5) {
|
||||
svc_id = qrtr_get_service_id(cb->src_node, cb->src_port);
|
||||
if (svc_id > 0){
|
||||
for (i = 0; i < node->no_wake_svc.size; i++) {
|
||||
if (svc_id == node->no_wake_svc.arr[i]) {
|
||||
wake = false;
|
||||
break;
|
||||
if (svc_id > 0) {
|
||||
for (i = 0; i < MAX_NON_WAKE_SVC_LEN; i++) {
|
||||
if (svc_id == node->nonwake_svc[i]) {
|
||||
for (i = 0; i < node->no_wake_svc.size; i++) {
|
||||
if (svc_id == node->no_wake_svc.arr[i]) {
|
||||
wake = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1199,6 +1204,8 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int net_id,
|
|||
if (rt)
|
||||
sched_setscheduler(node->task, SCHED_FIFO, ¶m);
|
||||
|
||||
if (svc_arr)
|
||||
memcpy(node->nonwake_svc, svc_arr, MAX_NON_WAKE_SVC_LEN * sizeof(int));
|
||||
if(svc_arr && svc_arr->size) {
|
||||
node->no_wake_svc.arr = kmalloc_array(svc_arr->size, sizeof(u32), GFP_KERNEL);
|
||||
memcpy((void *)node->no_wake_svc.arr, (void *)svc_arr->arr,
|
||||
|
|
|
|||
Loading…
Reference in a new issue