s3fb: fix error return code in s3_pci_probe()
Fix to return -EINVAL when virtual vertical size smaller than real instead of 0, as done elsewhere in this function. Also remove dup code. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
fb8a15079a
commit
a2a6fc5f18
|
@ -1336,14 +1336,7 @@ static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
(info->var.bits_per_pixel * info->var.xres_virtual);
|
||||
if (info->var.yres_virtual < info->var.yres) {
|
||||
dev_err(info->device, "virtual vertical size smaller than real\n");
|
||||
goto err_find_mode;
|
||||
}
|
||||
|
||||
/* maximize virtual vertical size for fast scrolling */
|
||||
info->var.yres_virtual = info->fix.smem_len * 8 /
|
||||
(info->var.bits_per_pixel * info->var.xres_virtual);
|
||||
if (info->var.yres_virtual < info->var.yres) {
|
||||
dev_err(info->device, "virtual vertical size smaller than real\n");
|
||||
rc = -EINVAL;
|
||||
goto err_find_mode;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue