aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-02-12 15:10:47 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-12 15:10:47 -0500
commit447d8c2603a417cca68240059fbf1babfd27774f (patch)
tree855679a6b469e01f33385f78224c791a15629839 /drivers/net
parent2bec5a369ee79576a3eea2c23863325089785a2c (diff)
net: move am79c961's probe function to .devinit.text
A pointer to am79c961_probe is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (if also having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/arm/am79c961a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 164b37e85eea..1c3c1f94268e 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -680,7 +680,7 @@ static const struct net_device_ops am79c961_netdev_ops = {
680#endif 680#endif
681}; 681};
682 682
683static int __init am79c961_probe(struct platform_device *pdev) 683static int __devinit am79c961_probe(struct platform_device *pdev)
684{ 684{
685 struct resource *res; 685 struct resource *res;
686 struct net_device *dev; 686 struct net_device *dev;