Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
between commit:
2871edb32f46 ("can: kvaser_usb: Fix possible completions during init_completion")
from Linus' tree and commit:
abb8670938b2 ("can: kvaser_usb_leaf: Ignore stale bus-off after start")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
index 19958037720f,5225e2da6437..000000000000
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@@ -1318,9 -1632,12 +1632,12 @@@ static int kvaser_usb_leaf_set_opt_mode
static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv)
{
+ struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv;
int err;
+ leaf->joining_bus = true;
+
- init_completion(&priv->start_comp);
+ reinit_completion(&priv->start_comp);
err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_START_CHIP,
priv->channel);
@@@ -1336,10 -1653,13 +1653,13 @@@
static int kvaser_usb_leaf_stop_chip(struct kvaser_usb_net_priv *priv)
{
+ struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv;
int err;
- init_completion(&priv->stop_comp);
+ reinit_completion(&priv->stop_comp);
+ cancel_delayed_work(&leaf->chip_state_req_work);
+
err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_STOP_CHIP,
priv->channel);
if (err)
Attachment:
pgpZEOlpmIMiz.pgp
Description: OpenPGP digital signature
