usb: cdc-wdm: Fix order in disconnect and fix locking

[mv-sheeva.git] / drivers / video / mbx / mbxfb.c

diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 80cd117ca65c6118954160b1cbcd813a76871ade..afea9abbd6780a669d124b5aa2aeb6c9c0c509f2 100644 (file)
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -693,7 +693,7 @@ static void __devinit setup_memc(struct fb_info *fbi)
        unsigned long tmp;
        int i;
 
-       /* FIXME: use platfrom specific parameters */
+       /* FIXME: use platform specific parameters */
        /* setup SDRAM controller */
        write_reg_dly((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |
                LMCFG_LMA_TS),
@@ -889,7 +889,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
        struct mbxfb_info *mfbi;
        struct mbxfb_platform_data *pdata;
 
-       dev_dbg(dev, "mbxfb_probe\n");
+       dev_dbg(&dev->dev, "mbxfb_probe\n");
 
        pdata = dev->dev.platform_data;
        if (!pdata) {