From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/drivers/mfd/display-serdes/serdes-irq.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel/drivers/mfd/display-serdes/serdes-irq.c b/kernel/drivers/mfd/display-serdes/serdes-irq.c index f4d7740..5aa685a 100644 --- a/kernel/drivers/mfd/display-serdes/serdes-irq.c +++ b/kernel/drivers/mfd/display-serdes/serdes-irq.c @@ -20,7 +20,8 @@ if (extcon_get_state(serdes->extcon, EXTCON_JACK_VIDEO_OUT)) atomic_set(&serdes->serdes_bridge->triggered, 1); - SERDES_DBG_MFD("%s: ret=%d\n", __func__, ret); + SERDES_DBG_MFD("%s %s %s ret=%d\n", __func__, dev_name(serdes->dev), + serdes->chip_data->name, ret); return IRQ_HANDLED; } @@ -33,14 +34,15 @@ if (serdes->chip_data->irq_ops->err_handle) ret = serdes->chip_data->irq_ops->err_handle(serdes); - SERDES_DBG_MFD("%s: ret=%d\n", __func__, ret); + SERDES_DBG_MFD("%s %s %s ret=%d\n", __func__, dev_name(serdes->dev), + serdes->chip_data->name, ret); return IRQ_HANDLED; } int serdes_irq_init(struct serdes *serdes) { - int ret; + int ret = 0; mutex_init(&serdes->irq_lock); @@ -55,8 +57,9 @@ if (serdes->lock_irq < 0) return serdes->lock_irq; - SERDES_DBG_MFD("%s %s lock_irq=%d\n", __func__, - serdes->chip_data->name, serdes->lock_irq); + SERDES_DBG_MFD("%s %s lock_irq=%d gpio=%d\n", __func__, + serdes->chip_data->name, serdes->lock_irq, + desc_to_gpio(serdes->lock_gpio)); ret = devm_request_threaded_irq(serdes->dev, serdes->lock_irq, NULL, serdes_bridge_lock_irq_handler, @@ -64,7 +67,7 @@ dev_name(serdes->dev), serdes); if (ret) return dev_err_probe(serdes->dev, ret, - "failed to request serdes lock IRQ\n"); + "failed to request serdes lock IRQ\n"); } /* error irq */ -- Gitblit v1.6.2