diff options
Diffstat (limited to 'drivers/usb/gadget/s3c2410_udc.c')
-rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 8d31848aab0..b8643771fa8 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
@@ -10,16 +10,6 @@ | |||
10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
11 | * the Free Software Foundation; either version 2 of the License, or | 11 | * the Free Software Foundation; either version 2 of the License, or |
12 | * (at your option) any later version. | 12 | * (at your option) any later version. |
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program; if not, write to the Free Software | ||
21 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
22 | * | ||
23 | */ | 13 | */ |
24 | 14 | ||
25 | #include <linux/module.h> | 15 | #include <linux/module.h> |
@@ -1082,7 +1072,7 @@ static int s3c2410_udc_ep_enable(struct usb_ep *_ep, | |||
1082 | if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) | 1072 | if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) |
1083 | return -ESHUTDOWN; | 1073 | return -ESHUTDOWN; |
1084 | 1074 | ||
1085 | max = le16_to_cpu(desc->wMaxPacketSize) & 0x1fff; | 1075 | max = usb_endpoint_maxp(desc) & 0x1fff; |
1086 | 1076 | ||
1087 | local_irq_save (flags); | 1077 | local_irq_save (flags); |
1088 | _ep->maxpacket = max & 0x7ff; | 1078 | _ep->maxpacket = max & 0x7ff; |
@@ -1903,7 +1893,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) | |||
1903 | 1893 | ||
1904 | /* irq setup after old hardware state is cleaned up */ | 1894 | /* irq setup after old hardware state is cleaned up */ |
1905 | retval = request_irq(IRQ_USBD, s3c2410_udc_irq, | 1895 | retval = request_irq(IRQ_USBD, s3c2410_udc_irq, |
1906 | IRQF_DISABLED, gadget_name, udc); | 1896 | 0, gadget_name, udc); |
1907 | 1897 | ||
1908 | if (retval != 0) { | 1898 | if (retval != 0) { |
1909 | dev_err(dev, "cannot get irq %i, err %d\n", IRQ_USBD, retval); | 1899 | dev_err(dev, "cannot get irq %i, err %d\n", IRQ_USBD, retval); |
@@ -1927,7 +1917,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) | |||
1927 | } | 1917 | } |
1928 | 1918 | ||
1929 | retval = request_irq(irq, s3c2410_udc_vbus_irq, | 1919 | retval = request_irq(irq, s3c2410_udc_vbus_irq, |
1930 | IRQF_DISABLED | IRQF_TRIGGER_RISING | 1920 | IRQF_TRIGGER_RISING |
1931 | | IRQF_TRIGGER_FALLING | IRQF_SHARED, | 1921 | | IRQF_TRIGGER_FALLING | IRQF_SHARED, |
1932 | gadget_name, udc); | 1922 | gadget_name, udc); |
1933 | 1923 | ||