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

Commit 892f6ebc authored by Jules Maselbas's avatar Jules Maselbas Committed by Greg Kroah-Hartman
Browse files

usb: host: max3421-hcd: Remove pdata test in max3421_hub_control() 



We do not have to test if platform_data pointer is null in
max3421_hub_control(), as the driver probe will fail if no
platform_data is found.

Fixes: 721fdc83 ("usb: max3421: Add devicetree support")
Signed-off-by: default avatarJules Maselbas <jules.maselbas@grenoble-inp.org>
Reported-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4756f35f

drivers/usb/host/max3421-hcd.c

+2 −13
Original line number Diff line number Diff line
@@ -1699,13 +1699,9 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index, 
	unsigned long flags;

	int retval = 0;



	spin_lock_irqsave(&max3421_hcd->lock, flags);



	pdata = spi->dev.platform_data;

	if (!pdata) {

		dev_err(&spi->dev, "Device platform data is missing\n");

		return -EFAULT;

	}



	spin_lock_irqsave(&max3421_hcd->lock, flags);



	switch (type_req) {

	case ClearHubFeature:
@@ -1882,7 +1878,6 @@ max3421_probe(struct spi_device *spi) 
	if (IS_ENABLED(CONFIG_OF) && dev->of_node) {

		pdata = devm_kzalloc(&spi->dev, sizeof(*pdata), GFP_KERNEL);

		if (!pdata) {

			dev_err(&spi->dev, "failed to allocate memory for private data\n");

			retval = -ENOMEM;

			goto error;

		}
@@ -1995,12 +1990,6 @@ max3421_remove(struct spi_device *spi) 


	spin_unlock_irqrestore(&max3421_hcd->lock, flags);



	if (IS_ENABLED(CONFIG_OF) && spi->dev.platform_data) {

		dev_dbg(&spi->dev, "Freeing platform data structure\n");

		devm_kfree(&spi->dev, spi->dev.platform_data);

		spi->dev.platform_data = NULL;

	}



	free_irq(spi->irq, hcd);



	usb_put_hcd(hcd);