From 2698ae495040f08898b37baf54e68fcf2a69ddbd Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Sun, 10 Jun 2012 13:12:22 +0200 Subject: [PATCH] --- yaml --- r: 317291 b: refs/heads/master c: 67c4e9f46b5241ff777ced09e29048363de8703f h: refs/heads/master i: 317289: 3162ea26a783f3871844135ea8e39c190bb9f17f 317287: 498a6deb92f2b158ae56f57d08f7ad4b926f37ae v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xx/smtcfb.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 231094f94b65..4e6e0e4108a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fe864409b54f60ed36804752acfd148da459e53 +refs/heads/master: 67c4e9f46b5241ff777ced09e29048363de8703f diff --git a/trunk/drivers/staging/sm7xx/smtcfb.c b/trunk/drivers/staging/sm7xx/smtcfb.c index 746c4cd5d30e..2c172d6cd65f 100644 --- a/trunk/drivers/staging/sm7xx/smtcfb.c +++ b/trunk/drivers/staging/sm7xx/smtcfb.c @@ -724,16 +724,13 @@ static void smtc_unmap_mmio(struct smtcfb_info *sfb) static int smtc_map_smem(struct smtcfb_info *sfb, struct pci_dev *pdev, u_long smem_len) { - if (sfb->fb.var.bits_per_pixel == 32) { + + sfb->fb.fix.smem_start = pci_resource_start(pdev, 0); + #ifdef __BIG_ENDIAN - sfb->fb.fix.smem_start = pci_resource_start(pdev, 0) - + 0x800000; -#else - sfb->fb.fix.smem_start = pci_resource_start(pdev, 0); + if (sfb->fb.var.bits_per_pixel == 32) + sfb->fb.fix.smem_start += 0x800000; #endif - } else { - sfb->fb.fix.smem_start = pci_resource_start(pdev, 0); - } sfb->fb.fix.smem_len = smem_len;