Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "Fix a potential crash in the ccp driver" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ccp - Ignore unconfigured CCP device on suspend/resume
This commit is contained in:
commit
e0f14b8ca3
|
@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *sp, pm_message_t state)
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
/* If there's no device there's nothing to do */
|
||||||
|
if (!ccp)
|
||||||
|
return 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&ccp->cmd_lock, flags);
|
spin_lock_irqsave(&ccp->cmd_lock, flags);
|
||||||
|
|
||||||
ccp->suspending = 1;
|
ccp->suspending = 1;
|
||||||
|
@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp)
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
/* If there's no device there's nothing to do */
|
||||||
|
if (!ccp)
|
||||||
|
return 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&ccp->cmd_lock, flags);
|
spin_lock_irqsave(&ccp->cmd_lock, flags);
|
||||||
|
|
||||||
ccp->suspending = 0;
|
ccp->suspending = 0;
|
||||||
|
|
Loading…
Reference in New Issue