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

Commit 7374ccc0 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Tomi Valkeinen
Browse files

fbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex 



If sh_mobile_lcdc_probe() fails after the allocation of driver-private
data, but before the initialization of all channels, a warning will be
printed due to the destruction of an uninitialized mutex:

    WARNING: CPU: 0 PID: 1 at kernel/locking/mutex-debug.c:116 mutex_destroy+0x5c/0x7c()
    DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))
    ...
    Backtrace:
    ...
    [<c00425b4>] (mutex_destroy) from [<c01d5858>] (sh_mobile_lcdc_remove+0x1bc/0x230)
     r4:df6a4800 r3:00000000
    [<c01d569c>] (sh_mobile_lcdc_remove) from [<c01d6620>] (sh_mobile_lcdc_probe+0xd54/0xe28)

Move the initialization of the mutexes from sh_mobile_lcdc_channel_init()
to immediately after the allocation of driver-private data to fix this.

Note that the interrupt number is moved to a new variable "irq", so we
can reuse the existing variable "i" for iterating over the channels.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 14048ffe

drivers/video/fbdev/sh_mobile_lcdcfb.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -2605,7 +2605,6 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch) 
	unsigned int max_size;

	unsigned int max_size;

	unsigned int i;

	unsigned int i;





	mutex_init(&ch->open_lock);

	ch->notify = sh_mobile_lcdc_display_notify;

	ch->notify = sh_mobile_lcdc_display_notify;





	/* Validate the format. */

	/* Validate the format. */
@@ -2704,7 +2703,7 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev) 
	struct resource *res;

	struct resource *res;

	int num_channels;

	int num_channels;

	int error;

	int error;

	int i;

	int irq, i;





	if (!pdata) {

	if (!pdata) {

		dev_err(&pdev->dev, "no platform data defined\n");

		dev_err(&pdev->dev, "no platform data defined\n");
@@ -2712,8 +2711,8 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev) 
	}

	}





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	i = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (!res || i < 0) {

	if (!res || irq < 0) {

		dev_err(&pdev->dev, "cannot get platform resources\n");

		dev_err(&pdev->dev, "cannot get platform resources\n");

		return -ENOENT;

		return -ENOENT;

	}

	}
@@ -2726,16 +2725,18 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev) 




	priv->dev = &pdev->dev;

	priv->dev = &pdev->dev;

	priv->meram_dev = pdata->meram_dev;

	priv->meram_dev = pdata->meram_dev;

	for (i = 0; i < ARRAY_SIZE(priv->ch); i++)

		mutex_init(&priv->ch[i].open_lock);

	platform_set_drvdata(pdev, priv);

	platform_set_drvdata(pdev, priv);





	error = request_irq(i, sh_mobile_lcdc_irq, 0,

	error = request_irq(irq, sh_mobile_lcdc_irq, 0,

			    dev_name(&pdev->dev), priv);

			    dev_name(&pdev->dev), priv);

	if (error) {

	if (error) {

		dev_err(&pdev->dev, "unable to request irq\n");

		dev_err(&pdev->dev, "unable to request irq\n");

		goto err1;

		goto err1;

	}

	}





	priv->irq = i;

	priv->irq = irq;

	atomic_set(&priv->hw_usecnt, -1);

	atomic_set(&priv->hw_usecnt, -1);





	for (i = 0, num_channels = 0; i < ARRAY_SIZE(pdata->ch); i++) {

	for (i = 0, num_channels = 0; i < ARRAY_SIZE(pdata->ch); i++) {