diff for duplicates of <20200813140604.GA456946@mwanda> diff --git a/a/1.txt b/N1/1.txt index a46fe95..de5a0f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,7 +42,8 @@ index 47cc1ff5b88e..dee3e689b54d 100644 { struct pucan_status_msg *sm = (struct pucan_status_msg *)rx_msg; - struct peak_usb_device *dev = usb_if->dev[pucan_stmsg_get_channel(sm)]; -- struct pcan_usb_fd_device *pdev - container_of(dev, struct pcan_usb_fd_device, dev); +- struct pcan_usb_fd_device *pdev = +- container_of(dev, struct pcan_usb_fd_device, dev); + struct pcan_usb_fd_device *pdev; enum can_state new_state = CAN_STATE_ERROR_ACTIVE; enum can_state rx_state, tx_state; @@ -60,14 +61,15 @@ index 47cc1ff5b88e..dee3e689b54d 100644 + netdev = dev->netdev; + /* nothing should be sent while in BUS_OFF state */ - if (dev->can.state = CAN_STATE_BUS_OFF) + if (dev->can.state == CAN_STATE_BUS_OFF) return 0; @@ -579,9 +591,14 @@ static int pcan_usb_fd_decode_error(struct pcan_usb_fd_if *usb_if, struct pucan_msg *rx_msg) { struct pucan_error_msg *er = (struct pucan_error_msg *)rx_msg; - struct peak_usb_device *dev = usb_if->dev[pucan_ermsg_get_channel(er)]; -- struct pcan_usb_fd_device *pdev - container_of(dev, struct pcan_usb_fd_device, dev); +- struct pcan_usb_fd_device *pdev = +- container_of(dev, struct pcan_usb_fd_device, dev); + struct pcan_usb_fd_device *pdev; + struct peak_usb_device *dev; + diff --git a/a/content_digest b/N1/content_digest index b97805b..8b92cc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH net] can: peak_usb: add range checking in decode operations\0" - "Date\0Thu, 13 Aug 2020 14:06:04 +0000\0" + "Date\0Thu, 13 Aug 2020 17:06:04 +0300\0" "To\0Wolfgang Grandegger <wg@grandegger.com>" " Stephane Grosjean <s.grosjean@peak-system.com>\0" "Cc\0Marc Kleine-Budde <mkl@pengutronix.de>" @@ -57,7 +57,8 @@ " {\n" " \tstruct pucan_status_msg *sm = (struct pucan_status_msg *)rx_msg;\n" "-\tstruct peak_usb_device *dev = usb_if->dev[pucan_stmsg_get_channel(sm)];\n" - "-\tstruct pcan_usb_fd_device *pdev -\t\t\tcontainer_of(dev, struct pcan_usb_fd_device, dev);\n" + "-\tstruct pcan_usb_fd_device *pdev =\n" + "-\t\t\tcontainer_of(dev, struct pcan_usb_fd_device, dev);\n" "+\tstruct pcan_usb_fd_device *pdev;\n" " \tenum can_state new_state = CAN_STATE_ERROR_ACTIVE;\n" " \tenum can_state rx_state, tx_state;\n" @@ -75,14 +76,15 @@ "+\tnetdev = dev->netdev;\n" "+\n" " \t/* nothing should be sent while in BUS_OFF state */\n" - " \tif (dev->can.state = CAN_STATE_BUS_OFF)\n" + " \tif (dev->can.state == CAN_STATE_BUS_OFF)\n" " \t\treturn 0;\n" "@@ -579,9 +591,14 @@ static int pcan_usb_fd_decode_error(struct pcan_usb_fd_if *usb_if,\n" " \t\t\t\t struct pucan_msg *rx_msg)\n" " {\n" " \tstruct pucan_error_msg *er = (struct pucan_error_msg *)rx_msg;\n" "-\tstruct peak_usb_device *dev = usb_if->dev[pucan_ermsg_get_channel(er)];\n" - "-\tstruct pcan_usb_fd_device *pdev -\t\t\tcontainer_of(dev, struct pcan_usb_fd_device, dev);\n" + "-\tstruct pcan_usb_fd_device *pdev =\n" + "-\t\t\tcontainer_of(dev, struct pcan_usb_fd_device, dev);\n" "+\tstruct pcan_usb_fd_device *pdev;\n" "+\tstruct peak_usb_device *dev;\n" "+\n" @@ -127,4 +129,4 @@ "-- \n" 2.28.0 -6305193c5c2e0ccf964f370c36d057871b3684b7aa3482426802e1ead2e29dda +770d67d17429bb852fdf56b4301ba035a30235c5bd653a97b5d0f43c7722ffec
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.