diff --git a/[refs] b/[refs] index 31f556d3d226..5e2f7b413a1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cf0db5e3d32b3b1bb7c792f09f945ac929c659e +refs/heads/master: e913972423fc6ec0eee33469f691f9cce3a47680 diff --git a/trunk/drivers/staging/gma500/mrst_device.c b/trunk/drivers/staging/gma500/mrst_device.c index 195a25b92798..436580d02ef7 100644 --- a/trunk/drivers/staging/gma500/mrst_device.c +++ b/trunk/drivers/staging/gma500/mrst_device.c @@ -155,7 +155,7 @@ int mrst_backlight_init(struct drm_device *dev) mrst_backlight_device = backlight_device_register("mrst-bl", NULL, (void *)dev, &mrst_ops, &props); - + if (IS_ERR(mrst_backlight_device)) return PTR_ERR(mrst_backlight_device); @@ -367,7 +367,7 @@ const struct psb_ops mrst_chip_ops = { #ifdef CONFIG_BACKLIGHT_CLASS_DEVICE .backlight_init = mrst_backlight_init, #endif - + .init_pm = mrst_init_pm, .save_regs = mrst_save_display_registers, .restore_regs = mrst_restore_display_registers,