Merge tag 'v3.14.79' into linux-3.14.x-rpi

[people/arne_f/kernel.git] / drivers / net / can / dev.c

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index fa78e45a2beeb424a6efeb305e6d3db61b3165b7..de333c740203ddd68a1449b12a6a2d4b0b518f54 100644 (file)
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -665,9 +665,6 @@ static int can_changelink(struct net_device *dev,
                }
        }
 
-       if (!data)
-               return 0;
-
        if (data[IFLA_CAN_CTRLMODE]) {
                struct can_ctrlmode *cm;