diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/video/sis | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/video/sis')
| -rw-r--r-- | drivers/video/sis/init.c | 5 | ||||
| -rw-r--r-- | drivers/video/sis/sis_main.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index 4f26bc2..f082ae5 100644 --- a/drivers/video/sis/init.c +++ b/drivers/video/sis/init.c @@ -3320,8 +3320,9 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo) } #ifndef GETBITSTR -#define GENBITSMASK(mask) GENMASK(1?mask,0?mask) -#define GETBITS(var,mask) (((var) & GENBITSMASK(mask)) >> (0?mask)) +#define BITMASK(h,l) (((unsigned)(1U << ((h)-(l)+1))-1)<<(l)) +#define GENMASK(mask) BITMASK(1?mask,0?mask) +#define GETBITS(var,mask) (((var) & GENMASK(mask)) >> (0?mask)) #define GETBITSTR(val,from,to) ((GETBITS(val,from)) << (0?to)) #endif diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 22ad028..977e279 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -5994,6 +5994,7 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if(!ivideo->sisvga_enabled) { if(pci_enable_device(pdev)) { if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); + pci_set_drvdata(pdev, NULL); framebuffer_release(sis_fb_info); return -EIO; } @@ -6210,6 +6211,7 @@ error_3: vfree(ivideo->bios_abase); pci_dev_put(ivideo->lpcdev); if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); + pci_set_drvdata(pdev, NULL); if(!ivideo->sisvga_enabled) pci_disable_device(pdev); framebuffer_release(sis_fb_info); @@ -6478,8 +6480,8 @@ error_3: vfree(ivideo->bios_abase); "disabled"); - fb_info(sis_fb_info, "%s frame buffer device version %d.%d.%d\n", - ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL); + printk(KERN_INFO "fb%d: %s frame buffer device version %d.%d.%d\n", + sis_fb_info->node, ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL); printk(KERN_INFO "sisfb: Copyright (C) 2001-2005 Thomas Winischhofer\n"); @@ -6521,6 +6523,8 @@ static void sisfb_remove(struct pci_dev *pdev) mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size); #endif + pci_set_drvdata(pdev, NULL); + /* If device was disabled when starting, disable * it when quitting. */ |