Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2a6fc5f authored by Wei Yongjun's avatar Wei Yongjun Committed by Tomi Valkeinen
Browse files

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fb8a1507

drivers/video/s3fb.c

+1 −8
Original line number Diff line number Diff line
@@ -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;

	}