diff options
| author | Alexander Graf <agraf@suse.de> | 2013-08-29 02:41:59 +0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-29 02:41:59 +0400 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /drivers/video/omap2/displays/panel-lgphilips-lb035q02.c | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc (diff) | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 (diff) | |
| download | linux-bf550fc93d9855872a95e69e4002256110d89858.tar.xz | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
Diffstat (limited to 'drivers/video/omap2/displays/panel-lgphilips-lb035q02.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-lgphilips-lb035q02.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c index 4ea6548c0ae9..6c51430ddb37 100644 --- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c +++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c @@ -109,12 +109,12 @@ static int lb035q02_panel_probe(struct omap_dss_device *dssdev) dssdev->panel.timings = lb035q02_timings; - ld = devm_kzalloc(&dssdev->dev, sizeof(*ld), GFP_KERNEL); + ld = devm_kzalloc(dssdev->dev, sizeof(*ld), GFP_KERNEL); if (!ld) return -ENOMEM; for (i = 0; i < panel_data->num_gpios; ++i) { - r = devm_gpio_request_one(&dssdev->dev, panel_data->gpios[i], + r = devm_gpio_request_one(dssdev->dev, panel_data->gpios[i], panel_data->gpio_invert[i] ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW, "panel gpio"); @@ -123,7 +123,7 @@ static int lb035q02_panel_probe(struct omap_dss_device *dssdev) } mutex_init(&ld->lock); - dev_set_drvdata(&dssdev->dev, ld); + dev_set_drvdata(dssdev->dev, ld); return 0; } @@ -134,7 +134,7 @@ static void lb035q02_panel_remove(struct omap_dss_device *dssdev) static int lb035q02_panel_enable(struct omap_dss_device *dssdev) { - struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev); + struct lb035q02_data *ld = dev_get_drvdata(dssdev->dev); int r; mutex_lock(&ld->lock); @@ -153,7 +153,7 @@ err: static void lb035q02_panel_disable(struct omap_dss_device *dssdev) { - struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev); + struct lb035q02_data *ld = dev_get_drvdata(dssdev->dev); mutex_lock(&ld->lock); |