Commit 452785d0 authored by Ingo Molnar's avatar Ingo Molnar Committed by Greg Kroah-Hartman
Browse files

headers/prep: usb: gadget: Fix namespace collision 



Avoid namespace collision with dev_ioctl() and dev_open(), also provided by generic headers.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f663729

drivers/usb/gadget/legacy/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ ep0_poll (struct file *fd, poll_table *wait) 
	return mask;

}



static long dev_ioctl (struct file *fd, unsigned code, unsigned long value)

static long gadget_dev_ioctl (struct file *fd, unsigned code, unsigned long value)

{

	struct dev_data		*dev = fd->private_data;

	struct usb_gadget	*gadget = dev->gadget;
@@ -1904,7 +1904,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) 
}



static int

dev_open (struct inode *inode, struct file *fd)

gadget_dev_open (struct inode *inode, struct file *fd)

{

	struct dev_data		*dev = inode->i_private;

	int			value = -EBUSY;
@@ -1924,12 +1924,12 @@ dev_open (struct inode *inode, struct file *fd) 
static const struct file_operations ep0_operations = {

	.llseek =	no_llseek,



	.open =		dev_open,

	.open =		gadget_dev_open,

	.read =		ep0_read,

	.write =	dev_config,

	.fasync =	ep0_fasync,

	.poll =		ep0_poll,

	.unlocked_ioctl = dev_ioctl,

	.unlocked_ioctl = gadget_dev_ioctl,

	.release =	dev_release,

};