From 35c7efefcbc3633dc89cd451c30ae566a1f9f7ea Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Mon, 17 Sep 2012 16:12:48 +0200 Subject: [PATCH] --- yaml --- r: 325378 b: refs/heads/master c: 9f6fe04326da5036ab0d01553eacabe9b21d47ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 03a662e623bc..8b1ac004dffa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d459a03b90ae2895d0726b9a6f5147efa30ca11f +refs/heads/master: 9f6fe04326da5036ab0d01553eacabe9b21d47ae diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index b809e2caf5f2..f6ecac35d495 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -77,7 +77,7 @@ static struct fb_var_screeninfo smtcfb_var = { }; static struct fb_fix_screeninfo smtcfb_fix = { - .id = "sm712fb", + .id = "smXXXfb", .type = FB_TYPE_PACKED_PIXELS, .visual = FB_VISUAL_TRUECOLOR, .line_length = 800 * 3, @@ -681,7 +681,7 @@ static struct fb_ops smtcfb_ops = { /* * alloc struct smtcfb_info and assign the default value */ -static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name) +static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev) { struct smtcfb_info *sfb; @@ -698,7 +698,6 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name) sfb->fb.fbops = &smtcfb_ops; sfb->fb.fix = smtcfb_fix; - strcpy(sfb->fb.fix.id, name); sfb->fb.var = smtcfb_var; @@ -781,7 +780,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, { struct smtcfb_info *sfb; u_long smem_size = 0x00800000; /* default 8MB */ - char name[16]; int err; unsigned long pFramebufferPhysical; @@ -791,9 +789,9 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, if (err) return err; - sprintf(name, "sm%Xfb", ent->device); + sprintf(smtcfb_fix.id, "sm%Xfb", ent->device); - sfb = smtc_alloc_fb_info(pdev, name); + sfb = smtc_alloc_fb_info(pdev); if (!sfb) { err = -ENOMEM;