diff --git a/[refs] b/[refs] index 2a4508bb3eda..a80c582dcbb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b8dec323d3409308817820247222806d0356cdf +refs/heads/master: d86938fb63a9189cedfd3509cafc4b1def68703d diff --git a/trunk/drivers/staging/line6/toneport.c b/trunk/drivers/staging/line6/toneport.c index b754f69a29c4..31b624b63425 100644 --- a/trunk/drivers/staging/line6/toneport.c +++ b/trunk/drivers/staging/line6/toneport.c @@ -168,7 +168,7 @@ static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2) cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ); if (ret < 0) { - err("send failed (error %d)\n", ret); + dev_err(&usbdev->dev, "send failed (error %d)\n", ret); return ret; }