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

Merge "crypto: ice: Sanitize the ice device return address."

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-05 16:10:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit a599fe22fa
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/crypto/msm/ice.c
View file

@ -869,7 +869,7 @@ static int qcom_ice_restore_key_config(struct ice_device *ice_dev)
static int qcom_ice_init_clocks(struct ice_device *ice) static int qcom_ice_init_clocks(struct ice_device *ice)
{ {
int ret = -EINVAL; int ret = -EINVAL;
struct ice_clk_info *clki; struct ice_clk_info *clki = NULL;
struct device *dev = ice->pdev; struct device *dev = ice->pdev;
struct list_head *head = &ice->clk_list_head; struct list_head *head = &ice->clk_list_head;
@ -913,7 +913,7 @@ out:
static int qcom_ice_enable_clocks(struct ice_device *ice, bool enable) static int qcom_ice_enable_clocks(struct ice_device *ice, bool enable)
{ {
int ret = 0; int ret = 0;
struct ice_clk_info *clki; struct ice_clk_info *clki = NULL;
struct device *dev = ice->pdev; struct device *dev = ice->pdev;
struct list_head *head = &ice->clk_list_head; struct list_head *head = &ice->clk_list_head;
@ -1590,12 +1590,14 @@ struct platform_device *qcom_ice_get_pdevice(struct device_node *node)
if (ice_dev->pdev->of_node == node) { if (ice_dev->pdev->of_node == node) {
pr_info("%s: found ice device %pK\n", __func__, pr_info("%s: found ice device %pK\n", __func__,
ice_dev); ice_dev);
ice_pdev = to_platform_device(ice_dev->pdev);
break; break;
} }
} }
ice_pdev = to_platform_device(ice_dev->pdev); if (ice_pdev)
pr_info("%s: matching platform device %pK\n", __func__, ice_pdev); pr_info("%s: matching platform device %pK\n", __func__,
ice_pdev);
out: out:
return ice_pdev; return ice_pdev;
} }
@ -1615,11 +1617,11 @@ static struct ice_device *get_ice_device_from_storage_type
if (!strcmp(ice_dev->ice_instance_type, storage_type)) { if (!strcmp(ice_dev->ice_instance_type, storage_type)) {
pr_debug("%s: found ice device %pK\n", pr_debug("%s: found ice device %pK\n",
__func__, ice_dev); __func__, ice_dev);
break; return ice_dev;
} }
} }
out: out:
return ice_dev; return NULL;
} }
static int enable_ice_setup(struct ice_device *ice_dev) static int enable_ice_setup(struct ice_device *ice_dev)