From 3ab75d27bca5f65693357306d56f663d8f9218f3 Mon Sep 17 00:00:00 2001 From: Hao Fang Date: Thu, 5 Sep 2019 23:56:14 +0800 Subject: [PATCH] crypto/hisilicon/zip: fix for zip not register to crypto if no device driver inclusion category: bugfix bugzilla: NA CVE: NA Feature or Bugfix:Bugfix Signed-off-by: Hao Fang Reviewed-by: xuzaibo Reviewed-by: Ling Mingqiang Reviewed-by: Zhou Wang Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/crypto/hisilicon/zip/zip_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c index 289e5bff145f..54d876570839 100644 --- a/drivers/crypto/hisilicon/zip/zip_main.c +++ b/drivers/crypto/hisilicon/zip/zip_main.c @@ -1419,6 +1419,12 @@ static int __init hisi_zip_init(void) goto err_pci; } + if (list_empty(&hisi_zip_list)) { + pr_err("no hisilicon zip device!\n"); + ret = -ENODEV; + goto err_probe_device; + } + #ifndef CONFIG_IOMMU_SVA if (uacce_mode == UACCE_MODE_UACCE) return 0; @@ -1427,12 +1433,12 @@ static int __init hisi_zip_init(void) ret = hisi_zip_register_to_crypto(); if (ret < 0) { pr_err("Failed to register driver to crypto.\n"); - goto err_crypto; + goto err_probe_device; } return 0; -err_crypto: +err_probe_device: pci_unregister_driver(&hisi_zip_pci_driver); err_pci: hisi_zip_unregister_debugfs(); -- GitLab