diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-25 03:30:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-25 03:30:24 +0200 |
| commit | 23ee3e4e5bd27bdbc0f1785eef7209ce872794c7 (patch) | |
| tree | 62a9f321d41bfe59c01d6a8d8af59e567e8e2c34 /drivers/virtio | |
| parent | Merge tag 'nfsd-5.8-2' of git://linux-nfs.org/~bfields/linux into master (diff) | |
| parent | Revert "PCI/PM: Assume ports without DLL Link Active train links in 100 ms" (diff) | |
| download | linux-23ee3e4e5bd27bdbc0f1785eef7209ce872794c7.tar.xz linux-23ee3e4e5bd27bdbc0f1785eef7209ce872794c7.zip | |
Merge tag 'pci-v5.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into master
Pull PCI fixes from Bjorn Helgaas:
- Reject invalid IRQ 0 command line argument for virtio_mmio because
IRQ 0 now generates warnings (Bjorn Helgaas)
- Revert "PCI/PM: Assume ports without DLL Link Active train links in
100 ms", which broke nouveau (Bjorn Helgaas)
* tag 'pci-v5.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "PCI/PM: Assume ports without DLL Link Active train links in 100 ms"
virtio-mmio: Reject invalid IRQ 0 command line argument
Diffstat (limited to 'drivers/virtio')
| -rw-r--r-- | drivers/virtio/virtio_mmio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 9d16aaffca9d..627ac0487494 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -641,11 +641,11 @@ static int vm_cmdline_set(const char *device, &vm_cmdline_id, &consumed); /* - * sscanf() must processes at least 2 chunks; also there + * sscanf() must process at least 2 chunks; also there * must be no extra characters after the last chunk, so * str[consumed] must be '\0' */ - if (processed < 2 || str[consumed]) + if (processed < 2 || str[consumed] || irq == 0) return -EINVAL; resources[0].flags = IORESOURCE_MEM; |