diff --git a/[refs] b/[refs]
index f2214d0aa71d..711b858f0757 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10be7eb36b93364b98688831ee7d26f58402bb96
+refs/heads/master: ae06b8330aefb0338017c427d5694fc8ea9144c8
diff --git a/trunk/drivers/net/can/usb/ems_usb.c b/trunk/drivers/net/can/usb/ems_usb.c
index bfab283ba9b1..11c87840cc00 100644
--- a/trunk/drivers/net/can/usb/ems_usb.c
+++ b/trunk/drivers/net/can/usb/ems_usb.c
@@ -1024,8 +1024,6 @@ static int ems_usb_probe(struct usb_interface *intf,
 	dev->can.do_set_mode = ems_usb_set_mode;
 	dev->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
 
-	netdev->flags |= IFF_ECHO; /* we support local echo */
-
 	netdev->netdev_ops = &ems_usb_netdev_ops;
 
 	netdev->flags |= IFF_ECHO; /* we support local echo */