From 3d3dcd2c69b2a479c1e16ff9b46ddce170c7330e Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Sat, 27 Oct 2012 07:25:53 +0900 Subject: [PATCH] --- yaml --- r: 337341 b: refs/heads/master c: 1bbffe726e00f1f79ba1b8cf0cbd78223c995c0f h: refs/heads/master i: 337339: 75e8e4b9e240064bafc3ac6631f734905aac47eb v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/usbduxfast.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5f49e4ccdc0c..eb5880d1fd23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1481c5f1083ac11f83beb75bfa8eb3ae44b4dbc3 +refs/heads/master: 1bbffe726e00f1f79ba1b8cf0cbd78223c995c0f diff --git a/trunk/drivers/staging/comedi/drivers/usbduxfast.c b/trunk/drivers/staging/comedi/drivers/usbduxfast.c index 060d853dc651..b4e987b892ac 100644 --- a/trunk/drivers/staging/comedi/drivers/usbduxfast.c +++ b/trunk/drivers/staging/comedi/drivers/usbduxfast.c @@ -370,9 +370,8 @@ static void usbduxfastsub_ai_Irq(struct urb *urb) return; default: - printk("comedi%d: usbduxfast: non-zero urb status received in " - "ai intr context: %d\n", - udfs->comedidev->minor, urb->status); + pr_err("non-zero urb status received in ai intr context: %d\n", + urb->status); s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_ERROR; comedi_event(udfs->comedidev, s); @@ -454,7 +453,8 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs) 1, /* Length */ EZTIMEOUT); /* Timeout */ if (ret < 0) { - printk("comedi_: usbduxfast_: control msg failed (start)\n"); + dev_err(&udfs->interface->dev, + "control msg failed (start)\n"); return ret; }