diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-26 16:51:14 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-26 16:51:14 +0200 |
commit | 603ea288dc53dfabf823bf7d38e401a945309492 (patch) | |
tree | 6260717cd4254283d71f5e671b02cb89305f768d /drivers/net/can/peak_canfd/peak_pciefd_main.c | |
parent | usb: renesas_usbhs: getting residue from callback_result (diff) | |
parent | Linux 5.8-rc2 (diff) | |
download | linux-dev-603ea288dc53dfabf823bf7d38e401a945309492.tar.xz linux-dev-603ea288dc53dfabf823bf7d38e401a945309492.zip |
Merge 5.8-rc2 into usb-linus
Felipe has based his patches on that tag, so update my usb-linus branch
to it as well so that I can pull his patches in here easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can/peak_canfd/peak_pciefd_main.c')
-rw-r--r-- | drivers/net/can/peak_canfd/peak_pciefd_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/peak_canfd/peak_pciefd_main.c b/drivers/net/can/peak_canfd/peak_pciefd_main.c index d08a3d559114..6ad83a881039 100644 --- a/drivers/net/can/peak_canfd/peak_pciefd_main.c +++ b/drivers/net/can/peak_canfd/peak_pciefd_main.c @@ -146,7 +146,7 @@ struct pciefd_rx_dma { __le32 irq_status; __le32 sys_time_low; __le32 sys_time_high; - struct pucan_rx_msg msg[0]; + struct pucan_rx_msg msg[]; } __packed __aligned(4); /* Tx Link record */ @@ -194,7 +194,7 @@ struct pciefd_board { struct pci_dev *pci_dev; int can_count; spinlock_t cmd_lock; /* 64-bits cmds must be atomic */ - struct pciefd_can *can[0]; /* array of network devices */ + struct pciefd_can *can[]; /* array of network devices */ }; /* supported device ids. */ |