diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-13 12:17:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-13 12:17:58 -0800 |
| commit | d18c993351c3c3d13efb35eb8d2ca05f2435e7c9 (patch) | |
| tree | 5451ff7b40a91aa133e6273c7a4fb849449d0ab5 /drivers/soc | |
| parent | db080b80dc7ef5a60a798ae11c496c6b7d7b0541 (diff) | |
| parent | 97e02e9dfbbc0dee8a82157e027c3ef27e0b13c1 (diff) | |
Merge "icnss: Remove dev reference"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/icnss.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c index 37204dcbc065..7067c5733773 100644 --- a/drivers/soc/qcom/icnss.c +++ b/drivers/soc/qcom/icnss.c @@ -3557,18 +3557,16 @@ unsigned int icnss_socinfo_get_serial_number(struct device *dev) } EXPORT_SYMBOL(icnss_socinfo_get_serial_number); -int icnss_set_wlan_mac_address(struct device *dev, - const u8 *in, uint32_t len) +int icnss_set_wlan_mac_address(const u8 *in, const uint32_t len) { - struct icnss_priv *priv = dev_get_drvdata(dev); + struct icnss_priv *priv = penv; uint32_t no_of_mac_addr; struct icnss_wlan_mac_addr *addr = NULL; int iter; u8 *temp = NULL; - if (priv->magic != ICNSS_MAGIC) { - icnss_pr_err("Invalid drvdata: dev %p, data %p, magic 0x%x\n", - dev, priv, priv->magic); + if (!priv) { + icnss_pr_err("Priv data is NULL\n"); return -EINVAL; } |