From 4e99246375e42c50fc2baf0518e30e869f992b19 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 7 Jul 2009 22:34:13 +0200 Subject: [PATCH] --- yaml --- r: 155054 b: refs/heads/master c: 99f5d48b98fb52db6da379c1b1fd6c87438ee45a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/matrox/matroxfb_crtc2.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18d08d1be8c7..b7fa83629da0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7272e5bd9ead4389849db9749b8c4dabd459dd1 +refs/heads/master: 99f5d48b98fb52db6da379c1b1fd6c87438ee45a diff --git a/trunk/drivers/video/matrox/matroxfb_crtc2.c b/trunk/drivers/video/matrox/matroxfb_crtc2.c index 909e10a11898..ebcb5c6b4962 100644 --- a/trunk/drivers/video/matrox/matroxfb_crtc2.c +++ b/trunk/drivers/video/matrox/matroxfb_crtc2.c @@ -289,16 +289,18 @@ static int matroxfb_dh_release(struct fb_info* info, int user) { #undef m2info } +/* + * This function is called before the register_framebuffer so + * no locking is needed. + */ static void matroxfb_dh_init_fix(struct matroxfb_dh_fb_info *m2info) { struct fb_fix_screeninfo *fix = &m2info->fbcon.fix; strcpy(fix->id, "MATROX DH"); - mutex_lock(&m2info->fbcon.mm_lock); fix->smem_start = m2info->video.base; fix->smem_len = m2info->video.len_usable; - mutex_unlock(&m2info->fbcon.mm_lock); fix->ypanstep = 1; fix->ywrapstep = 0; fix->xpanstep = 8; /* TBD */