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

Commit a7a5ac58 authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King
Browse files

PCMCIA: fix pxa2xx_lubbock modular build error 



Commit d0d26c33 broke the driver by
propagating a pointer to the platform_device where a pointer to the
generic device was expected, leading to a spectacular crash...

Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d93626e8

drivers/pcmcia/pxa2xx_base.c

+3 −3
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) 
		skt->nr = ops->first + i;

		skt->ops = ops;

		skt->socket.owner = ops->owner;

		skt->socket.dev.parent = dev;

		skt->socket.dev.parent = &dev->dev;

		skt->socket.pci_irq = NO_IRQ;



		ret = pxa2xx_drv_pcmcia_add_one(skt);
@@ -304,8 +304,8 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) 
			soc_pcmcia_remove_one(&sinfo->skt[i]);

		kfree(sinfo);

	} else {

		pxa2xx_configure_sockets(dev);

		dev_set_drvdata(dev, sinfo);

		pxa2xx_configure_sockets(&dev->dev);

		dev_set_drvdata(&dev->dev, sinfo);

	}



	return ret;