Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74aaf024 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/stable-updates'

parents e161183b 467fc498

arch/sh/boards/board-ap325rxa.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi_gpio.h>

#include <media/soc_camera.h>

#include <media/soc_camera_platform.h>

#include <media/sh_mobile_ceu.h>

#include <video/sh_mobile_lcdc.h>

drivers/video/sh_mobile_lcdcfb.c

+2 −4
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv) 
{

	struct sh_mobile_lcdc_chan *ch;

	struct sh_mobile_lcdc_board_cfg	*board_cfg;

	unsigned long tmp;

	int k;



	/* tell the board code to disable the panel */
@@ -456,9 +455,8 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv) 
		if (board_cfg->display_off)

			board_cfg->display_off(board_cfg->board_data);



		/* cleanup deferred io if SYS bus */

		tmp = ch->cfg.sys_bus_cfg.deferred_io_msec;

		if (ch->ldmt1r_value & (1 << 12) && tmp) {

		/* cleanup deferred io if enabled */

		if (ch->info.fbdefio) {

			fb_deferred_io_cleanup(&ch->info);

			ch->info.fbdefio = NULL;

		}