diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/runtime.c | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-tps65910.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-ili9342.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index ef13ad08afb..f8bc937728b 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -958,6 +958,7 @@ int __pm_runtime_resume(struct device *dev, int rpmflags) spin_lock_irqsave(&dev->power.lock, flags); retval = rpm_resume(dev, rpmflags); + BUG_ON (dev == NULL); /* OLIO: I get weird crashes here */ spin_unlock_irqrestore(&dev->power.lock, flags); return retval; diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c index 06146219d9d..d64de51db97 100644 --- a/drivers/gpio/gpio-tps65910.c +++ b/drivers/gpio/gpio-tps65910.c @@ -82,7 +82,7 @@ static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset) GPIO_CFG_MASK); } -#ifdef CONFIG_OF +#if 0 /* #ifdef CONFIG_OF - olio: We DO have a DT, but no tps info there. */ static struct tps65910_board *tps65910_parse_dt_for_gpio(struct device *dev, struct tps65910 *tps65910, int chip_ngpio) { @@ -149,7 +149,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev) tps65910_gpio->gpio_chip.set = tps65910_gpio_set; tps65910_gpio->gpio_chip.get = tps65910_gpio_get; tps65910_gpio->gpio_chip.dev = &pdev->dev; -#ifdef CONFIG_OF_GPIO +#if 0 /* #ifdef CONFIG_OF_GPIO */ tps65910_gpio->gpio_chip.of_node = tps65910->dev->of_node; #endif if (pdata && pdata->gpio_base) diff --git a/drivers/video/omap2/displays/panel-ili9342.c b/drivers/video/omap2/displays/panel-ili9342.c index 21bcec734d6..40a9713aa0d 100644 --- a/drivers/video/omap2/displays/panel-ili9342.c +++ b/drivers/video/omap2/displays/panel-ili9342.c @@ -31,6 +31,7 @@ #include <video/omapdss.h> +#define OLIODEBUG #ifdef OLIODEBUG #define oliodebug(...) printk ( __VA_ARGS__ ) #else @@ -569,7 +570,7 @@ static int ili9342_resume(struct device *dev) { return ret; } - init_ili9342_hw (spi); + ili9342_init_seq(spi); /* init_ili9342_hw (spi); */ return 0; } |