diff --git a/[refs] b/[refs] index 0e7606cae547..42874fea315f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6562382a6d862090f3fb956ef05425ec2283dfbd +refs/heads/master: 2748f26b6a948308278ea43d343a6ec12aa18195 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index 7a0304a85735..8bdd1e8584cb 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -679,7 +679,7 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb, return 0; - fail: +fail: cx25821_free_buffer(q, buf); return rc; }