linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] can: peak_pci: add unused device id. in devices table
@ 2015-09-30 10:42 Stephane Grosjean
  2015-09-30 11:09 ` Marc Kleine-Budde
  0 siblings, 1 reply; 4+ messages in thread
From: Stephane Grosjean @ 2015-09-30 10:42 UTC (permalink / raw)
  To: linux-can Mailing List; +Cc: Stephane Grosjean

While new PEAK_PCIE_OEM_ID has been defined since 3.17, no corresponding
entry has been added in the peak_pci_tbl[] of the peak_pci CAN driver.

This patch enables now users of the PCAN-PCI Express OEM card to run the
peak_pci driver too.

Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
---
 drivers/net/can/sja1000/peak_pci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index e5fac36..131026f 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -87,6 +87,7 @@ static const struct pci_device_id peak_pci_tbl[] = {
 	{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 	{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 	{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
 #ifdef CONFIG_CAN_PEAK_PCIEC
 	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
 	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC34_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* pull-request: can 2015-09-30
@ 2015-09-30 11:12 Marc Kleine-Budde
  2015-09-30 11:12 ` [PATCH] can: peak_pci: add unused device id. in devices table Marc Kleine-Budde
  0 siblings, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-09-30 11:12 UTC (permalink / raw)
  To: netdev; +Cc: davem, linux-can, kernel

Hello David,

this is a pull request of a single patch for 4.3.

The patch is by Stephane Grosjean and add support for the peak OEM PCI card to
the peak_pci driver by adding its device ID.

regards,
Marc
---

The following changes since commit b84f78782052ee4516903e5d0566a5eee365b771:

  net: Initialize flow flags in input path (2015-09-29 21:52:32 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.3-20150930

for you to fetch changes up to 7253054e5d05233063c48f57ac02283bd35753d8:

  can: peak_pci: add unused device id. in devices table (2015-09-30 12:57:58 +0200)

----------------------------------------------------------------
linux-can-fixes-for-4.3-20150930

----------------------------------------------------------------
Stephane Grosjean (1):
      can: peak_pci: add unused device id. in devices table

 drivers/net/can/sja1000/peak_pci.c | 1 +
 1 file changed, 1 insertion(+)

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-30 11:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-30 10:42 [PATCH] can: peak_pci: add unused device id. in devices table Stephane Grosjean
2015-09-30 11:09 ` Marc Kleine-Budde
2015-09-30 11:14   ` Marc Kleine-Budde
  -- strict thread matches above, loose matches on Subject: below --
2015-09-30 11:12 pull-request: can 2015-09-30 Marc Kleine-Budde
2015-09-30 11:12 ` [PATCH] can: peak_pci: add unused device id. in devices table Marc Kleine-Budde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).