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

Commit cd40c4c4 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Greg Kroah-Hartman
Browse files

USB: fsl_qe_udc: Check for muram allocation errors 



The QE UDC doesn't check for cpm_muram_alloc() return values, this
might cause all sorts of misbehaviour when cpm_muram_alloc() failed
to allocate the muram memory.

While at at, change few dev_dbg() calls to dev_err(), so that the
driver would not die silently.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 011b15df

drivers/usb/gadget/fsl_qe_udc.c

+9 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/ioport.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/slab.h>

#include <linux/list.h>

#include <linux/interrupt.h>
@@ -370,6 +371,9 @@ static int qe_ep_bd_init(struct qe_udc *udc, unsigned char pipe_num) 
	/* alloc multi-ram for BD rings and set the ep parameters */

	tmp_addr = cpm_muram_alloc(sizeof(struct qe_bd) * (bdring_len +

				USB_BDRING_LEN_TX), QE_ALIGNMENT_OF_BD);

	if (IS_ERR_VALUE(tmp_addr))

		return -ENOMEM;



	out_be16(&epparam->rbase, (u16)tmp_addr);

	out_be16(&epparam->tbase, (u16)(tmp_addr +

				(sizeof(struct qe_bd) * bdring_len)));
@@ -689,7 +693,7 @@ en_done2: 
en_done1:

	spin_unlock_irqrestore(&udc->lock, flags);

en_done:

	dev_dbg(udc->dev, "failed to initialize %s\n", ep->ep.name);

	dev_err(udc->dev, "failed to initialize %s\n", ep->ep.name);

	return -ENODEV;

}
@@ -2408,6 +2412,8 @@ static struct qe_udc __devinit *qe_udc_config(struct of_device *ofdev) 
	tmp_addr = cpm_muram_alloc((USB_MAX_ENDPOINTS *

					sizeof(struct usb_ep_para)),

					   USB_EP_PARA_ALIGNMENT);

	if (IS_ERR_VALUE(tmp_addr))

		goto cleanup;



	for (i = 0; i < USB_MAX_ENDPOINTS; i++) {

		out_be16(&usbpram->epptr[i], (u16)tmp_addr);
@@ -2513,7 +2519,7 @@ static int __devinit qe_udc_probe(struct of_device *ofdev, 
	/* Initialize the udc structure including QH member and other member */

	udc_controller = qe_udc_config(ofdev);

	if (!udc_controller) {

		dev_dbg(&ofdev->dev, "udc_controll is NULL\n");

		dev_err(&ofdev->dev, "failed to initialize\n");

		return -ENOMEM;

	}
@@ -2568,7 +2574,7 @@ static int __devinit qe_udc_probe(struct of_device *ofdev, 
	/* create a buf for ZLP send, need to remain zeroed */

	udc_controller->nullbuf = kzalloc(256, GFP_KERNEL);

	if (udc_controller->nullbuf == NULL) {

		dev_dbg(udc_controller->dev, "cannot alloc nullbuf\n");

		dev_err(udc_controller->dev, "cannot alloc nullbuf\n");

		ret = -ENOMEM;

		goto err3;

	}