Merge tag 'backlight-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

[sfrench/cifs-2.6.git] / drivers / parisc / led.c

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 0c6e8b44b4ede70806d2b986c8bba1b216735bf9..c60b465f6fe45e35f52d2843cca285830808cc75 100644 (file)
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -568,6 +568,9 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
                break;
 
        case DISPLAY_MODEL_LASI:
+               /* Skip to register LED in QEMU */
+               if (running_on_qemu)
+                       return 1;
                LED_DATA_REG = data_reg;
                led_func_ptr = led_LASI_driver;
                printk(KERN_INFO "LED display at %lx registered\n", LED_DATA_REG);