Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a012d30 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: sm7xxfb: fix error handling 



We were checking smtc_regbaseaddress and that too at a place where it
can never be NULL. Real check should be on sfb->lfb immediately after
we do ioremap.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d6cb68d5

drivers/staging/sm7xxfb/sm7xxfb.c

+8 −7
Original line number Diff line number Diff line
@@ -1456,6 +1456,14 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, 
#else

		sfb->lfb = ioremap(mmio_base, 0x00800000);

#endif

		if (!sfb->lfb) {

			dev_err(&pdev->dev,

				"%s: unable to map memory mapped IO!\n",

				sfb->fb->fix.id);

			err = -ENOMEM;

			goto failed_fb;

		}



		sfb->mmio = (smtc_regbaseaddress =

		    sfb->lfb + 0x00700000);

		sfb->dp_regs = sfb->lfb + 0x00408000;
@@ -1466,13 +1474,6 @@ static int smtcfb_pci_probe(struct pci_dev *pdev, 
			dev_info(&pdev->dev, "sfb->lfb=%p\n", sfb->lfb);

		}

#endif

		if (!smtc_regbaseaddress) {

			dev_err(&pdev->dev,

				"%s: unable to map memory mapped IO!\n",

				sfb->fb->fix.id);

			err = -ENOMEM;

			goto failed_fb;

		}



		/* set MCLK = 14.31818 * (0x16 / 0x2) */

		smtc_seqw(0x6a, 0x16);