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

staging: Fix SEP build

Browse source 
SEP build fails if crypto is not selected.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox 2012-02-13 22:37:20 +00:00 • committed by Greg Kroah-Hartman
parent 89ae7d7093
commit ebb3bf5018
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/sep/sep_crypto.c
View file

@ -74,6 +74,8 @@
#include "sep_dev.h" #include "sep_dev.h"
#include "sep_crypto.h" #include "sep_crypto.h"
#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)
/* Globals for queuing */ /* Globals for queuing */
static spinlock_t queue_lock; static spinlock_t queue_lock;
static struct crypto_queue sep_queue; static struct crypto_queue sep_queue;
@ -4052,3 +4054,5 @@ void sep_crypto_takedown(void)
tasklet_kill(&sep_dev->finish_tasklet); tasklet_kill(&sep_dev->finish_tasklet);
} }
#endif

5
drivers/staging/sep/sep_main.c
View file

@ -4245,7 +4245,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
sep->power_save_setup = 1; sep->power_save_setup = 1;
#endif #endif
/* register kernel crypto driver */ /* register kernel crypto driver */
#if defined(CONFIG_CRYPTO) #if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)
error = sep_crypto_setup(); error = sep_crypto_setup();
if (error) { if (error) {
dev_err(&sep->pdev->dev, "crypto setup failed\n"); dev_err(&sep->pdev->dev, "crypto setup failed\n");
@ -4292,8 +4292,9 @@ static void sep_remove(struct pci_dev *pdev)
misc_deregister(&sep->miscdev_sep); misc_deregister(&sep->miscdev_sep);
/* Unregister from kernel crypto */ /* Unregister from kernel crypto */
#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)
sep_crypto_takedown(); sep_crypto_takedown();
#endif
/* Free the irq */ /* Free the irq */
free_irq(sep->pdev->irq, sep); free_irq(sep->pdev->irq, sep);