Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2019-03-22 14:31:43 +0100
committerMichal Hocko <mhocko@suse.com>2019-03-22 14:31:43 +0100
commit7ae33582a2ffa052a938e0619c9c8769b0953eb5 (patch)
treef7ffc1d6fbfdcdcd2615218e38a47c158bfe03b7
parent5369e9314ec9902b871ff1f750a86527cc5b713b (diff)
parentfbecf0cde54195f4296b11adcb889aaafa0d27a3 (diff)
Merge remote-tracking branch 'origin/users/tzimmermann/SLE11-SP4/for-next' into users/mhocko/SLE11-SP4/for-nextSLE11-SP4
-rw-r--r--drivers/video/chipsfb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index cff742abdc5d..62afd7f85051 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -351,7 +351,7 @@ static int __devinit
chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
{
struct fb_info *p;
- unsigned long addr, size;
+ unsigned long addr;
unsigned short cmd;
int rc = -ENODEV;
@@ -363,7 +363,6 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
goto err_disable;
addr = pci_resource_start(dp, 0);
- size = pci_resource_len(dp, 0);
if (addr == 0)
goto err_disable;