From: Maxime Ripard <mripard@kernel.org>
Date: Mon, 27 May 2024 09:08:31 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: v6.11-rc1~141^2~24^2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=375c4d1583948cf2439833e4a85d5a0aee853895;p=thirdparty%2Flinux.git

Merge drm/drm-next into drm-misc-next

Let's start the new release cycle.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
---

375c4d1583948cf2439833e4a85d5a0aee853895
diff --cc drivers/gpu/drm/panel/panel-ilitek-ili9341.c
index 761fce1f24b31,b933380b7eb78..775d5d5e828ca
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
@@@ -722,11 -723,10 +723,11 @@@ static int ili9341_probe(struct spi_dev
  
  	if (!strcmp(id->name, "sf-tc240t-9370-t"))
  		return ili9341_dpi_probe(spi, dc, reset);
 -	else if (!strcmp(id->name, "yx240qv29"))
 +
 +	if (!strcmp(id->name, "yx240qv29"))
  		return ili9341_dbi_probe(spi, dc, reset);
  
- 	return -1;
+ 	return -ENODEV;
  }
  
  static void ili9341_remove(struct spi_device *spi)