diff options
| -rw-r--r-- | drivers/video/s3fb.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index 47ca86c5c6c0..d838ba829459 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c | |||
| @@ -1336,14 +1336,7 @@ static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 1336 | (info->var.bits_per_pixel * info->var.xres_virtual); | 1336 | (info->var.bits_per_pixel * info->var.xres_virtual); |
| 1337 | if (info->var.yres_virtual < info->var.yres) { | 1337 | if (info->var.yres_virtual < info->var.yres) { |
| 1338 | dev_err(info->device, "virtual vertical size smaller than real\n"); | 1338 | dev_err(info->device, "virtual vertical size smaller than real\n"); |
| 1339 | goto err_find_mode; | 1339 | rc = -EINVAL; |
| 1340 | } | ||
| 1341 | |||
| 1342 | /* maximize virtual vertical size for fast scrolling */ | ||
| 1343 | info->var.yres_virtual = info->fix.smem_len * 8 / | ||
| 1344 | (info->var.bits_per_pixel * info->var.xres_virtual); | ||
| 1345 | if (info->var.yres_virtual < info->var.yres) { | ||
| 1346 | dev_err(info->device, "virtual vertical size smaller than real\n"); | ||
| 1347 | goto err_find_mode; | 1340 | goto err_find_mode; |
| 1348 | } | 1341 | } |
| 1349 | 1342 | ||
