Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249763
b: refs/heads/master
c: 23a4231
h: refs/heads/master
i:
  249761: 872594f
  249759: 67931ed
v: v3
  • Loading branch information
anish kumar authored and Greg Kroah-Hartman committed May 19, 2011
1 parent cb29577 commit 412e757
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 617a0c7177195a5cef6f0c2e559ee05b5d4191dd
refs/heads/master: 23a4231150ad227c99b7358ae9a741def5898d90
8 changes: 4 additions & 4 deletions trunk/drivers/staging/sm7xx/smtcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ static int smtc_map_smem(struct smtcfb_info *sfb,
sfb->fb.screen_base = smtc_VRAMBaseAddress;

if (!sfb->fb.screen_base) {
printk(KERN_INFO "%s: unable to map screen memory\n",
printk(KERN_ERR "%s: unable to map screen memory\n",
sfb->fb.fix.id);
return -ENOMEM;
}
Expand Down Expand Up @@ -938,7 +938,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
}
#endif
if (!smtc_RegBaseAddress) {
printk(KERN_INFO
printk(KERN_ERR
"%s: unable to map memory mapped IO\n",
sfb->fb.fix.id);
err = -ENOMEM;
Expand Down Expand Up @@ -973,7 +973,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
smtc_seqw(0x6b, 0x02);
break;
default:
printk(KERN_INFO
printk(KERN_ERR
"No valid Silicon Motion display chip was detected!\n");

goto failed_fb;
Expand Down Expand Up @@ -1006,7 +1006,7 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
return 0;

failed:
printk(KERN_INFO "Silicon Motion, Inc. primary display init fail\n");
printk(KERN_ERR "Silicon Motion, Inc. primary display init fail\n");

smtc_unmap_smem(sfb);
smtc_unmap_mmio(sfb);
Expand Down

0 comments on commit 412e757

Please sign in to comment.