diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-09 09:43:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-09 09:43:40 -0700 |
| commit | 9091fe19e075e0bb7f0b48aa6b6d081a495897ec (patch) | |
| tree | 036d528d87913229351dd740ec9356d4ebe61f0a /drivers | |
| parent | 543676bc40fec1b453a2467d2495302154e78223 (diff) | |
| parent | 0563833084ee9401f7f67055b494092cf5e8ba8a (diff) | |
Merge "soc: qcom: subsystem_notif_virt: Add a NULL check and fix a data type"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/qcom/subsystem_notif_virt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/soc/qcom/subsystem_notif_virt.c b/drivers/soc/qcom/subsystem_notif_virt.c index f8ce53cfa9f7..5c9acf7e4563 100644 --- a/drivers/soc/qcom/subsystem_notif_virt.c +++ b/drivers/soc/qcom/subsystem_notif_virt.c @@ -43,7 +43,7 @@ struct subsystem_descriptor { enum subsystem_type type; struct notifier_block nb; void *handle; - unsigned int ssr_irq; + int ssr_irq; struct list_head subsystem_list; struct work_struct work; }; @@ -91,7 +91,7 @@ static int subsys_notif_virt_probe(struct platform_device *pdev) struct device_node *child = NULL; const char *ss_type; struct resource *res; - struct subsystem_descriptor *subsystem; + struct subsystem_descriptor *subsystem = NULL; int ret = 0; if (!pdev) { @@ -193,7 +193,8 @@ static int subsys_notif_virt_probe(struct platform_device *pdev) } } - INIT_WORK(&subsystem->work, subsystem_notif_wq_func); + if (subsystem) + INIT_WORK(&subsystem->work, subsystem_notif_wq_func); return 0; err: destroy_workqueue(ssr_wq); |