* [PATCH] can/peak_usb: fix missing ctrlmode_ init for every dev
@ 2015-03-02 10:54 Stephane Grosjean
2015-03-04 9:19 ` Marc Kleine-Budde
0 siblings, 1 reply; 2+ messages in thread
From: Stephane Grosjean @ 2015-03-02 10:54 UTC (permalink / raw)
To: linux-can Mailing List; +Cc: Stephane Grosjean
Fixes a missing initialization of ctrlmode and ctrlmode_supported fields,
for all other CAN devices than the first one. This fix only concerns
the PCAN-USB Pro FD dual-channels CAN-FD device made by PEAK-System.
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
---
drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
index 962c3f0..0bac0f1 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
@@ -879,6 +879,10 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)
pdev->usb_if = ppdev->usb_if;
pdev->cmd_buffer_addr = ppdev->cmd_buffer_addr;
+
+ /* do a copy of the ctrlmode[_supported] too */
+ dev->can.ctrlmode = ppdev->dev.can.ctrlmode;
+ dev->can.ctrlmode_supported = ppdev->dev.can.ctrlmode_supported;
}
pdev->usb_if->dev[dev->ctrl_idx] = dev;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] can/peak_usb: fix missing ctrlmode_ init for every dev
2015-03-02 10:54 [PATCH] can/peak_usb: fix missing ctrlmode_ init for every dev Stephane Grosjean
@ 2015-03-04 9:19 ` Marc Kleine-Budde
0 siblings, 0 replies; 2+ messages in thread
From: Marc Kleine-Budde @ 2015-03-04 9:19 UTC (permalink / raw)
To: Stephane Grosjean, linux-can Mailing List
[-- Attachment #1: Type: text/plain, Size: 653 bytes --]
On 03/02/2015 11:54 AM, Stephane Grosjean wrote:
> Fixes a missing initialization of ctrlmode and ctrlmode_supported fields,
> for all other CAN devices than the first one. This fix only concerns
> the PCAN-USB Pro FD dual-channels CAN-FD device made by PEAK-System.
>
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Applied to can.
Thanks,
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: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-04 9:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-02 10:54 [PATCH] can/peak_usb: fix missing ctrlmode_ init for every dev Stephane Grosjean
2015-03-04 9:19 ` 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).