Merge branch 'for-4.19/intel-ish' into for-linus

Device-specific fixes for hid-intel-ish

2 files changed, 17 insertions, 5 deletions

diff --git a/drivers/hid/intel-ish-hid/ipc/ipc.c b/drivers/hid/intel-ish-hid/ipc/ipc.c
index 9a60ec13cb10..bfbca7ec54ce 100644
--- a/drivers/hid/intel-ish-hid/ipc/ipc.c
+++ b/drivers/hid/intel-ish-hid/ipc/ipc.c
@@ -907,8 +907,9 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev)
         struct ishtp_device *dev;
         int     i;
 
-        dev = kzalloc(sizeof(struct ishtp_device) + sizeof(struct ish_hw),
-                GFP_KERNEL);
+        dev = devm_kzalloc(&pdev->dev,
+                           sizeof(struct ishtp_device) + sizeof(struct ish_hw),
+                           GFP_KERNEL);
         if (!dev)
                 return NULL;
 
@@ -925,7 +926,9 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev)
         for (i = 0; i < IPC_TX_FIFO_SIZE; ++i) {
                 struct wr_msg_ctl_info  *tx_buf;
 
-                tx_buf = kzalloc(sizeof(struct wr_msg_ctl_info), GFP_KERNEL);
+                tx_buf = devm_kzalloc(&pdev->dev,
+                                      sizeof(struct wr_msg_ctl_info),
+                                      GFP_KERNEL);
                 if (!tx_buf) {
                         /*
                          * IPC buffers may be limited or not available
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index a2c53ea3b5ed..050f9872f5c0 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -95,6 +95,13 @@ static int ish_init(struct ishtp_device *dev)
         return 0;
 }
 
+static const struct pci_device_id ish_invalid_pci_ids[] = {
+        /* Mehlow platform special pci ids */
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xA309)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xA30A)},
+        {}
+};
+
 /**
  * ish_probe() - PCI driver probe callback
  * @pdev:       pci device
@@ -110,6 +117,10 @@ static int ish_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct ish_hw *hw;
         int     ret;
 
+        /* Check for invalid platforms for ISH support */
+        if (pci_dev_present(ish_invalid_pci_ids))
+                return -ENODEV;
+
         /* enable pci dev */
         ret = pci_enable_device(pdev);
         if (ret) {
@@ -172,7 +183,6 @@ free_irq:
         free_irq(pdev->irq, dev);
 free_device:
         pci_iounmap(pdev, hw->mem_addr);
-        kfree(dev);
 release_regions:
         pci_release_regions(pdev);
 disable_device:
@@ -202,7 +212,6 @@ static void ish_remove(struct pci_dev *pdev)
         pci_release_regions(pdev);
         pci_clear_master(pdev);
         pci_disable_device(pdev);
-        kfree(ishtp_dev);
 }
 
 static struct device __maybe_unused *ish_resume_device;