Skip to content

Commit

Permalink
[media] mt9m032: fix two dead-locks
Browse files Browse the repository at this point in the history
Fix a copy-paste typo and a nested locking function call in mt9m032.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed May 14, 2012
1 parent dfea001 commit b1e1179
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/media/video/mt9m032.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,11 @@ static int mt9m032_set_pad_format(struct v4l2_subdev *subdev,
}

/* Scaling is not supported, the format is thus fixed. */
ret = mt9m032_get_pad_format(subdev, fh, fmt);
fmt->format = *__mt9m032_get_pad_format(sensor, fh, fmt->which);
ret = 0;

done:
mutex_lock(&sensor->lock);
mutex_unlock(&sensor->lock);
return ret;
}

Expand Down

0 comments on commit b1e1179

Please sign in to comment.