diff --git a/[refs] b/[refs] index 17e4a6f0da49..8fa5ad5841ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8aab1278147e3b067903983a835ef3c68281b13 +refs/heads/master: ad602259451ddc8b0f83cb312cb54223317eda74 diff --git a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/dt3155v4l/dt3155v4l.c index a5e409170418..49463611f4f3 100644 --- a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c +++ b/trunk/drivers/staging/dt3155v4l/dt3155v4l.c @@ -612,7 +612,7 @@ dt3155_queue_dma_contig_init(struct videobuf_queue *q, unsigned int msize, void *priv) { - struct dt3155_priv *pd = q->priv_data; + struct dt3155_priv *pd = priv; videobuf_queue_dma_contig_init(q, ops, dev, irqlock, type, field, msize, priv);