diff --git a/[refs] b/[refs] index a6e283de9d73..867e202672b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0449359f053829ec89c026b5fb80bbe7190a5fe8 +refs/heads/master: 2620c6e31735248ac26403558bd4279a8af619d8 diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/drivers/video/nvidia/nvidia.c index 610575319444..7c36b5fe582e 100644 --- a/trunk/drivers/video/nvidia/nvidia.c +++ b/trunk/drivers/video/nvidia/nvidia.c @@ -1016,7 +1016,7 @@ static int nvidiafb_release(struct fb_info *info, int user) par->open_count--; done: mutex_unlock(&par->open_lock); - return 0; + return err; } static struct fb_ops nvidia_fb_ops = {