git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
pvrusb2
/
pvrusb2-io.c
diff --git
a/drivers/media/video/pvrusb2/pvrusb2-io.c
b/drivers/media/video/pvrusb2/pvrusb2-io.c
index
1e39376
..
57fb320
100644
(file)
--- a/
drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/
drivers/media/video/pvrusb2/pvrusb2-io.c
@@
-289,7
+289,7
@@
static void pvr2_buffer_done(struct pvr2_buffer *bp)
pvr2_buffer_set_none(bp);
bp->signature = 0;
bp->stream = NULL;
pvr2_buffer_set_none(bp);
bp->signature = 0;
bp->stream = NULL;
-
if (bp->purb)
usb_free_urb(bp->purb);
+ usb_free_urb(bp->purb);
pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"
" bufferDone %p",bp);
}
pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"
" bufferDone %p",bp);
}
@@
-429,7
+429,7
@@
static void pvr2_stream_done(struct pvr2_stream *sp)
} while (0); mutex_unlock(&sp->mutex);
}
} while (0); mutex_unlock(&sp->mutex);
}
-static void buffer_complete(struct urb *urb
, struct pt_regs *regs
)
+static void buffer_complete(struct urb *urb)
{
struct pvr2_buffer *bp = urb->context;
struct pvr2_stream *sp;
{
struct pvr2_buffer *bp = urb->context;
struct pvr2_stream *sp;