* [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
* Re: [PATCH] can: peak_pci: add unused device id. in devices table
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
0 siblings, 1 reply; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-09-30 11:09 UTC (permalink / raw)
To: Stephane Grosjean, linux-can Mailing List
[-- Attachment #1: Type: text/plain, Size: 687 bytes --]
On 09/30/2015 12:42 PM, Stephane Grosjean wrote:
> 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>
Thnx, added stable on Cc.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] can: peak_pci: add unused device id. in devices table
2015-09-30 11:12 pull-request: can 2015-09-30 Marc Kleine-Budde
@ 2015-09-30 11:12 ` Marc Kleine-Budde
0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-09-30 11:12 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel, Stephane Grosjean, Marc Kleine-Budde
From: Stephane Grosjean <s.grosjean@peak-system.com>
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>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
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 e5fac368068a..131026fbc2d7 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,},
--
2.6.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] can: peak_pci: add unused device id. in devices table
2015-09-30 11:09 ` Marc Kleine-Budde
@ 2015-09-30 11:14 ` Marc Kleine-Budde
0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2015-09-30 11:14 UTC (permalink / raw)
To: Stephane Grosjean, linux-can Mailing List
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
On 09/30/2015 01:09 PM, Marc Kleine-Budde wrote:
> On 09/30/2015 12:42 PM, Stephane Grosjean wrote:
>> 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>
>
> Thnx, added stable on Cc.
Doh. This somehow got lost.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ 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).