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

Commit d13c46c6 authored by Russell King's avatar Russell King
Browse files

DRM: armada: fix use of kfifo_put() 



The kfifo_put() API changed in 498d319b (kfifo API type safety)
which now results in the wrong pointer being added to the kfifo ring,
which then causes an oops.  Fix this.

Cc: <stable@vger.kernel.org> # 3.13
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bed86f15

drivers/gpu/drm/armada/armada_drv.c

+1 −9
Original line number Diff line number Diff line
@@ -68,15 +68,7 @@ void __armada_drm_queue_unref_work(struct drm_device *dev, 
{

	struct armada_private *priv = dev->dev_private;



	/*

	 * Yes, we really must jump through these hoops just to store a

	 * _pointer_ to something into the kfifo.  This is utterly insane

	 * and idiotic, because it kfifo requires the _data_ pointed to by

	 * the pointer const, not the pointer itself.  Not only that, but

	 * you have to pass a pointer _to_ the pointer you want stored.

	 */

	const struct drm_framebuffer *silly_api_alert = fb;

	WARN_ON(!kfifo_put(&priv->fb_unref, &silly_api_alert));

	WARN_ON(!kfifo_put(&priv->fb_unref, fb));

	schedule_work(&priv->fb_unref_work);

}