diff --git a/include/nuttx/pci/pci.h b/include/nuttx/pci/pci.h
index f3ee1cd420..2ae79dd562 100644
--- a/include/nuttx/pci/pci.h
+++ b/include/nuttx/pci/pci.h
@@ -52,7 +52,7 @@
 #define PCI_SLOT(devfn)       (((devfn) >> 3) & 0x1f)
 #define PCI_FUNC(devfn)       ((devfn) & 0x07)
 
-#define PCI_ANY_ID (~0)
+#define PCI_ANY_ID (uint16_t)(~0)
 
 /* PCI_DEFINE_DEVICE_TABLE - macro used to describe a pci device table
  * table: device table name
@@ -242,8 +242,8 @@ struct pci_device_id_s
 {
   uint16_t vendor;    /* Vendor id */
   uint16_t device;    /* Device id */
-  uint32_t subvendor; /* Sub vendor id */
-  uint32_t subdevice; /* Sub device id */
+  uint16_t subvendor; /* Sub vendor id */
+  uint16_t subdevice; /* Sub device id */
   uint32_t class;     /* (Class, subclass, prog-if) triplet */
   uint32_t class_mask;
   uintptr_t driver_data;