diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2016-07-21 15:30:34 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-21 15:30:34 -0700 |
| commit | b3277a2cbca0a3b984eaa6076cd14892b2c156b7 (patch) | |
| tree | c86817fde3b5aec2909d85e14b76df7ffbb505e2 | |
| parent | 9f6c463da11106b36a7698363ceeb203057c4cb9 (diff) | |
| parent | 90fd18c1418b46f56c30eedfa16a7dbfd68a318f (diff) | |
Merge "qcacld-3.0: Fix null qdf_dev pointer in ramdump handler" into wlan-cld3.driver.lnx.1.1-dev
| -rw-r--r-- | core/bmi/src/ol_fw.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index ee7f9401fa5f..f654c9674ed7 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -473,17 +473,13 @@ static inline void ol_get_ramdump_mem(struct device *dev, int ol_copy_ramdump(struct hif_opaque_softc *scn) { int ret = -1; - struct hif_opaque_softc **ol_ctx_ptr = &scn; - struct ol_context *ol_ctx; - qdf_device_t qdf_dev; struct ramdump_info *info; + qdf_device_t qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - ol_ctx = container_of(ol_ctx_ptr, struct ol_context , scn); - if (!ol_ctx) { - BMI_ERR("%s: Invalid ol_ctx\n", __func__); + if (!qdf_dev) { + BMI_ERR("%s qdf_dev is NULL", __func__); return -EINVAL; } - qdf_dev = ol_ctx->qdf_dev; if (hif_get_bus_type(scn) == QDF_BUS_TYPE_SDIO) return 0; |