summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/dabusb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-30 06:08:21 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-30 06:08:21 -0200
commit99dba13c2a2034363c788d26173340fb15c0c35c (patch)
tree3103fcabab3e7d3032a7da4b683bb6a859aad910 /linux/drivers/media/video/dabusb.c
parentb1a4f9b5853cc26829270834d194ee8358cb6e53 (diff)
parent72dcd14ea4cdcd3556de0fe17a85120578777e53 (diff)
downloadmediapointer-dvb-s2-99dba13c2a2034363c788d26173340fb15c0c35c.tar.gz
mediapointer-dvb-s2-99dba13c2a2034363c788d26173340fb15c0c35c.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/dabusb.c')
-rw-r--r--linux/drivers/media/video/dabusb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/dabusb.c b/linux/drivers/media/video/dabusb.c
index 21280dbc3..7ba206b34 100644
--- a/linux/drivers/media/video/dabusb.c
+++ b/linux/drivers/media/video/dabusb.c
@@ -202,7 +202,7 @@ static void dabusb_iso_complete (struct urb *purb)
err("dabusb_iso_complete: invalid len %d", len);
}
else
- warn("dabusb_iso_complete: corrupted packet status: %d", purb->iso_frame_desc[i].status);
+ dev_warn(&purb->dev->dev, "dabusb_iso_complete: corrupted packet status: %d\n", purb->iso_frame_desc[i].status);
if (dst != purb->actual_length)
err("dst!=purb->actual_length:%d!=%d", dst, purb->actual_length);
}
@@ -299,7 +299,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)
}
if( ret == -EPIPE ) {
- warn("CLEAR_FEATURE request to remove STALL condition.");
+ dev_warn(&s->usbdev->dev, "CLEAR_FEATURE request to remove STALL condition.\n");
if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe)))
err("request failed");
}