From ce4c371a9de1f5b9e1d15f9d59c5f7d079bcd6d7 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 16 Oct 2007 01:29:44 -0700 Subject: ps3av: dont distinguish between `boot' and `non-boot' autodetection don't distinguish between `boot' and `non-boot' autodetection now the autodetection code has been improved Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/ps3fb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/video/ps3fb.c') diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index c9037e984f8..07fdad1604a 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c @@ -548,7 +548,6 @@ static int ps3fb_set_par(struct fb_info *info) unsigned int mode; int i; unsigned long offset; - static int first = 1; DPRINTK("xres:%d xv:%d yres:%d yv:%d clock:%d\n", info->var.xres, info->var.xres_virtual, @@ -572,10 +571,9 @@ static int ps3fb_set_par(struct fb_info *info) /* Keep the special bits we cannot set using fb_var_screeninfo */ ps3fb_mode = (ps3fb_mode & ~PS3AV_MODE_MASK) | mode; - if (ps3av_set_video_mode(ps3fb_mode, first)) + if (ps3av_set_video_mode(ps3fb_mode)) return -EINVAL; - first = 0; return 0; } @@ -737,7 +735,7 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd, break; if (!(val & PS3AV_MODE_MASK)) { - u32 id = ps3av_get_auto_mode(0); + u32 id = ps3av_get_auto_mode(); if (id > 0) val = (val & ~PS3AV_MODE_MASK) | id; } -- cgit v1.2.3