Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb3bf50 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

staging: Fix SEP build 



SEP build fails if crypto is not selected.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89ae7d70

drivers/staging/sep/sep_crypto.c

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ 
#include "sep_dev.h"

#include "sep_crypto.h"



#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)



/* Globals for queuing */

static spinlock_t queue_lock;

static struct crypto_queue sep_queue;
@@ -4052,3 +4054,5 @@ void sep_crypto_takedown(void) 


	tasklet_kill(&sep_dev->finish_tasklet);

}



#endif

drivers/staging/sep/sep_main.c

+3 −2
Original line number Diff line number Diff line
@@ -4245,7 +4245,7 @@ static int __devinit sep_probe(struct pci_dev *pdev, 
	sep->power_save_setup = 1;

#endif

	/* register kernel crypto driver */

#if defined(CONFIG_CRYPTO)

#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)

	error = sep_crypto_setup();

	if (error) {

		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);



	/* Unregister from kernel crypto */

#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)

	sep_crypto_takedown();



#endif

	/* Free the irq */

	free_irq(sep->pdev->irq, sep);