diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-30 09:45:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-30 09:45:42 -0700 |
| commit | f5da5ddf81ad0bfb91fa5e7d087e2ad96f26b7b7 (patch) | |
| tree | 047dbe4a8d00588b08517e8df7bf5685e083bde6 /drivers | |
| parent | Merge tag 'platform-drivers-x86-v5.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 (diff) | |
| parent | crypto: ccp - Fix device IRQ counting by using platform_irq_count() (diff) | |
| download | wireguard-linux-f5da5ddf81ad0bfb91fa5e7d087e2ad96f26b7b7.tar.xz wireguard-linux-f5da5ddf81ad0bfb91fa5e7d087e2ad96f26b7b7.zip | |
Merge tag 'v5.19-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"Fix a regression that breaks the ccp driver"
* tag 'v5.19-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ccp - Fix device IRQ counting by using platform_irq_count()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/ccp/sp-platform.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/crypto/ccp/sp-platform.c b/drivers/crypto/ccp/sp-platform.c index 9dba52fbee99..7d79a8744f9a 100644 --- a/drivers/crypto/ccp/sp-platform.c +++ b/drivers/crypto/ccp/sp-platform.c @@ -85,17 +85,9 @@ static int sp_get_irqs(struct sp_device *sp) struct sp_platform *sp_platform = sp->dev_specific; struct device *dev = sp->dev; struct platform_device *pdev = to_platform_device(dev); - unsigned int i, count; int ret; - for (i = 0, count = 0; i < pdev->num_resources; i++) { - struct resource *res = &pdev->resource[i]; - - if (resource_type(res) == IORESOURCE_IRQ) - count++; - } - - sp_platform->irq_count = count; + sp_platform->irq_count = platform_irq_count(pdev); ret = platform_get_irq(pdev, 0); if (ret < 0) { @@ -104,7 +96,7 @@ static int sp_get_irqs(struct sp_device *sp) } sp->psp_irq = ret; - if (count == 1) { + if (sp_platform->irq_count == 1) { sp->ccp_irq = ret; } else { ret = platform_get_irq(pdev, 1); |