Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325379
b: refs/heads/master
c: 20d471c
h: refs/heads/master
i:
  325377: 01017cd
  325375: eaca102
v: v3
  • Loading branch information
Javier M. Mellid authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 35c7efe commit 6a4cc01
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f6fe04326da5036ab0d01553eacabe9b21d47ae
refs/heads/master: 20d471c447d5fede8d0d2b3618450d9ab8d82da9
20 changes: 7 additions & 13 deletions trunk/drivers/staging/sm7xxfb/sm7xxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ static struct fb_ops smtcfb_ops = {
};

/*
* alloc struct smtcfb_info and assign the default value
* alloc struct smtcfb_info and assign default values
*/
static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev)
{
Expand All @@ -692,18 +692,12 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev)

sfb->pdev = pdev;

/* init sfb->fb with default value */

sfb->fb.flags = FBINFO_FLAG_DEFAULT;
sfb->fb.fbops = &smtcfb_ops;

sfb->fb.fix = smtcfb_fix;

sfb->fb.var = smtcfb_var;

sfb->fb.pseudo_palette = sfb->colreg;

sfb->fb.par = sfb;
sfb->fb.flags = FBINFO_FLAG_DEFAULT;
sfb->fb.fbops = &smtcfb_ops;
sfb->fb.fix = smtcfb_fix;
sfb->fb.var = smtcfb_var;
sfb->fb.pseudo_palette = sfb->colreg;
sfb->fb.par = sfb;

return sfb;
}
Expand Down

0 comments on commit 6a4cc01

Please sign in to comment.