From 98cc783fa78ef1e9fdcf7003ff04634b1421522e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 12 Oct 2003 21:06:38 -0700 Subject: [PATCH] PCI: fix up probe functions for synclink drivers Can not be marked __init, must be marked __devinit or not at all. If it is marked __init, then oops can happen by a user writing to the "new_id" file from sysfs. --- drivers/char/synclink.c | 4 ++-- drivers/char/synclinkmp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index aeaa4d9f2b4d0..585196d778f98 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c @@ -8020,8 +8020,8 @@ int mgsl_sppp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) #endif /* ifdef CONFIG_SYNCLINK_SYNCPPP */ -static int __init synclink_init_one (struct pci_dev *dev, - const struct pci_device_id *ent) +static int __devinit synclink_init_one (struct pci_dev *dev, + const struct pci_device_id *ent) { struct mgsl_struct *info; diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index ec4d3393f9e7d..82c7afe29f924 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c @@ -5451,8 +5451,8 @@ void write_control_reg(SLMP_INFO * info) } -static int __init synclinkmp_init_one (struct pci_dev *dev, - const struct pci_device_id *ent) +static int __devinit synclinkmp_init_one (struct pci_dev *dev, + const struct pci_device_id *ent) { if (pci_enable_device(dev)) { printk("error enabling pci device %p\n", dev); -- 2.53.0