Merge "qos: Add NULL checking for irq descriptor"

This commit is contained in:
Linux Build Service Account 2017-02-15 17:01:34 -08:00 committed by Gerrit - the friendly Code Review server
commit 726f66a1d1

View file

@ -597,7 +597,11 @@ void pm_qos_add_request(struct pm_qos_request *req,
case PM_QOS_REQ_AFFINE_IRQ: case PM_QOS_REQ_AFFINE_IRQ:
if (irq_can_set_affinity(req->irq)) { if (irq_can_set_affinity(req->irq)) {
struct irq_desc *desc = irq_to_desc(req->irq); struct irq_desc *desc = irq_to_desc(req->irq);
struct cpumask *mask = desc->irq_data.common->affinity; struct cpumask *mask;
if (!desc)
return;
mask = desc->irq_data.common->affinity;
/* Get the current affinity */ /* Get the current affinity */
cpumask_copy(&req->cpus_affine, mask); cpumask_copy(&req->cpus_affine, mask);