evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cnss2: Return 0 from susped/resume for driver_ops null"

Browse source
This commit is contained in:
Linux Build Service Account 2019-01-22 14:52:13 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1e87dfb19c
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/net/wireless/cnss2/usb.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -297,14 +297,11 @@ static int cnss_usb_suspend(struct usb_interface *interface, pm_message_t state)
struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(NULL);
usb_priv = plat_priv->bus_priv;
if (!usb_priv->driver_ops) {
cnss_pr_err("driver_ops is NULL\n");
ret = -EINVAL;
goto out;
}
ret = usb_priv->driver_ops->suspend(usb_priv->usb_intf,
state);
out:
if (usb_priv->driver_ops)
ret = usb_priv->driver_ops->suspend(usb_priv->usb_intf, state);
else
cnss_pr_dbg("driver_ops is NULL\n");
return ret;
}
@ -315,14 +312,11 @@ static int cnss_usb_resume(struct usb_interface *interface)
struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(NULL);
usb_priv = plat_priv->bus_priv;
if (!usb_priv->driver_ops) {
cnss_pr_err("driver_ops is NULL\n");
ret = -EINVAL;
goto out;
}
ret = usb_priv->driver_ops->resume(usb_priv->usb_intf);
if (usb_priv->driver_ops)
ret = usb_priv->driver_ops->resume(usb_priv->usb_intf);
else
cnss_pr_dbg("driver_ops is NULL\n");
out:
return ret;
}