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

Commit 5874c18b authored by Neil Brown's avatar Neil Brown Committed by Jens Axboe
Browse files

umem: Fix match of pci_ids in umem driver 



the pci device list for umem was not using PCI_DEVICE, so the
subvendor/subdevice fields were not set to ANY, so matching
didn't work properly.

Change to use PCI_DEVICE.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 51ea208c

drivers/block/umem.c

+6 −11
Original line number Diff line number Diff line
@@ -1092,16 +1092,11 @@ static void mm_pci_remove(struct pci_dev *dev) 
	blk_cleanup_queue(card->queue);

}



static const struct pci_device_id mm_pci_ids[] = { {

	.vendor =	PCI_VENDOR_ID_MICRO_MEMORY,

	.device =	PCI_DEVICE_ID_MICRO_MEMORY_5415CN,

	}, {

	.vendor =	PCI_VENDOR_ID_MICRO_MEMORY,

	.device =	PCI_DEVICE_ID_MICRO_MEMORY_5425CN,

	}, {

	.vendor =	PCI_VENDOR_ID_MICRO_MEMORY,

	.device =	PCI_DEVICE_ID_MICRO_MEMORY_6155,

	}, {

static const struct pci_device_id mm_pci_ids[] = {

    {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_5415CN)},

    {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_5425CN)},

    {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY,PCI_DEVICE_ID_MICRO_MEMORY_6155)},

    {

	.vendor	=	0x8086,

	.device	=	0xB555,

	.subvendor=	0x1332,