From: Greg Kroah-Hartman Date: Tue, 18 Aug 2015 16:57:43 +0000 (-0700) Subject: Revert "usb: interface authorization: SysFS part of USB interface authorization" X-Git-Tag: firefly_0821_release~176^2~1219^2~12 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4d924d7a81627663720223b5c4330c18d8063fb6;p=firefly-linux-kernel-4.4.55.git Revert "usb: interface authorization: SysFS part of USB interface authorization" This reverts commit 187b3d75bbfba45a38b5d1d3656c0f11f6f6f2d0 as the signed-off-by address is invalid. Cc: Stefan Koch Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index d9ec2de6c4cf..cfc68c11c3f5 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -957,41 +957,6 @@ static ssize_t supports_autosuspend_show(struct device *dev, } static DEVICE_ATTR_RO(supports_autosuspend); -/* - * interface_authorized_show - show authorization status of an USB interface - * 1 is authorized, 0 is deauthorized - */ -static ssize_t interface_authorized_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct usb_interface *intf = to_usb_interface(dev); - - return sprintf(buf, "%u\n", intf->authorized); -} - -/* - * interface_authorized_store - authorize or deauthorize an USB interface - */ -static ssize_t interface_authorized_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) -{ - struct usb_interface *intf = to_usb_interface(dev); - bool val; - - if (strtobool(buf, &val) != 0) - return -EINVAL; - - if (val) - usb_authorize_interface(intf); - else - usb_deauthorize_interface(intf); - - return count; -} -static struct device_attribute dev_attr_interface_authorized = - __ATTR(authorized, S_IRUGO | S_IWUSR, - interface_authorized_show, interface_authorized_store); - static struct attribute *intf_attrs[] = { &dev_attr_bInterfaceNumber.attr, &dev_attr_bAlternateSetting.attr, @@ -1001,7 +966,6 @@ static struct attribute *intf_attrs[] = { &dev_attr_bInterfaceProtocol.attr, &dev_attr_modalias.attr, &dev_attr_supports_autosuspend.attr, - &dev_attr_interface_authorized.attr, NULL, }; static struct attribute_group intf_attr_grp = {