Skip to contentSkip to conversation

pxa/pcmcia: Fix pxa2xx PCMCIA oops

PATCH New Marc Zyngier 4 participants 6 messages Dec 15, 2009 – Dec 17, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pxa/pcmcia: Fix pxa2xx PCMCIA oops

Commit d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200:

PCMCIA: fix pxa2xx_lubbock modular build error

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...

---
 drivers/pcmcia/pxa2xx_base.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/pcmcia/pxa2xx_base.c +3 -3
index 3aabf1e..76e640b 100644
@@ -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;
Signature · 6 lines
1.6.0.4



-- 
I'm the slime oozin' out from your TV set...
#2 lore raw

PATCH 1/1 pxa/pcmcia: Fix pxa2xx PCMCIA oops

Quoted 12 lines · Dominik Brodowski
Quoted 9 lines · Marc Zyngier

Commit d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200:

PCMCIA: fix pxa2xx_lubbock modular build error

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...

Dominik,

Maybe you can help upstream this, and if you want my Ack, here it is:

#3 lore raw

PATCH 1/1 pxa/pcmcia: Fix pxa2xx PCMCIA oops

Russell,

do you want to take it upstream? If you prefer me doing it, I'll do so gladly.

Quoted 12 lines · Eric Miao
Quoted 10 lines · Dominik Brodowski
Quoted 9 lines · Marc Zyngier

Commit d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200:

PCMCIA: fix pxa2xx_lubbock modular build error

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...

Quoted 8 lines
Quoted 2 lines

Dominik,

Maybe you can help upstream this, and if you want my Ack, here it is:

Best,
Dominik

#4 lore raw

PATCH 1/1 pxa/pcmcia: Fix pxa2xx PCMCIA oops

Quoted 4 lines · Dominik Brodowski

Russell,

do you want to take it upstream? If you prefer me doing it, I'll do so gladly.

I've just added it to my tree.

#5 lore raw

PATCH 1/1 pxa/pcmcia: Fix pxa2xx PCMCIA oops

Hey,

Quoted 7 lines · Russell King - ARM Linux
Quoted 4 lines · Dominik Brodowski

Russell,

do you want to take it upstream? If you prefer me doing it, I'll do so gladly.

I've just added it to my tree.

Thanks.

Dominik