From ea5fd35007dde1af2c896efcf25ed3fdf0a68bc0 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sun, 26 Aug 2012 11:57:16 +0530 Subject: [PATCH] --- yaml --- r: 324763 b: refs/heads/master c: d328ddd20e076e940f4931cd032aedf1ae2ced73 h: refs/heads/master i: 324761: e2117dfd774516b90e8263867b02fb8926344d0d 324759: ec02a4eea52c694e1dd7d9dd3eeff7077f175b45 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f88ca4eed16e..a03389316700 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 147cd165757fc67fdf8ae58b015f39c8134970fb +refs/heads/master: d328ddd20e076e940f4931cd032aedf1ae2ced73 diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index 1c1780c70fbb..d935c23456e8 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -798,6 +798,8 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, if (err) return err; + sprintf(name, "sm%Xfb", ent->device); + sfb = smtc_alloc_fb_info(pdev, name); if (!sfb) { @@ -806,7 +808,6 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, } sfb->chip_id = ent->device; - sprintf(name, "sm%Xfb", sfb->chip_id); pci_set_drvdata(pdev, sfb);