lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UEAGLE: fix ueagle-atm Oops

Browse Source 
The array of attribute passed to sysfs_create_group() must be
NULL-terminated.

The sysfs entries are created before the start of the modem state machine
to avoid to stop it in case of errors in sysfs creation.  Also
{destroy,create}_fs_entries are removed as they do nothing.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
matthieu castet
2006-10-11 14:20:56 -07:00
committed by Greg Kroah-Hartman
parent deb8ee43a2
commit 9ab99c8c51
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/atm/ueagle-atm.c
View File

@@ -1648,16 +1648,12 @@ static struct attribute *attrs[] = {
&dev_attr_stat_usunc.attr, &dev_attr_stat_usunc.attr,
&dev_attr_stat_dsunc.attr, &dev_attr_stat_dsunc.attr,
&dev_attr_stat_firmid.attr, &dev_attr_stat_firmid.attr,
NULL,
}; };
static struct attribute_group attr_grp = { static struct attribute_group attr_grp = {
.attrs = attrs, .attrs = attrs,
}; };
static int create_fs_entries(struct usb_interface *intf)
{
return sysfs_create_group(&intf->dev.kobj, &attr_grp);
}
static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf, static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
@@ -1717,31 +1713,25 @@ static int uea_bind(struct usbatm_data *usbatm, struct usb_interface *intf,
} }
} }
ret = sysfs_create_group(&intf->dev.kobj, &attr_grp);
if (ret < 0)
goto error;
ret = uea_boot(sc); ret = uea_boot(sc);
if (ret < 0) { if (ret < 0)
kfree(sc); goto error;
return ret;
}
ret = create_fs_entries(intf);
if (ret) {
uea_stop(sc);
kfree(sc);
return ret;
}
return 0; return 0;
} error:
kfree(sc);
static void destroy_fs_entries(struct usb_interface *intf) return ret;
{
sysfs_remove_group(&intf->dev.kobj, &attr_grp);
} }
static void uea_unbind(struct usbatm_data *usbatm, struct usb_interface *intf) static void uea_unbind(struct usbatm_data *usbatm, struct usb_interface *intf)
{ {
struct uea_softc *sc = usbatm->driver_data; struct uea_softc *sc = usbatm->driver_data;
destroy_fs_entries(intf); sysfs_remove_group(&intf->dev.kobj, &attr_grp);
uea_stop(sc); uea_stop(sc);
kfree(sc); kfree(sc);
} }