aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-12-03 15:10:06 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-03 15:10:29 -0500
commit367576b813ed66a000e66ec18f7082bbc84c05d7 (patch)
treecfc804c46533855492d0f2fcd3580db308b739d2 /drivers/usb
parent16350a7258a3158807f3fafe33f1bb22b8ddd127 (diff)
parent0607f8622953541e95030ab011258d9f1f381357 (diff)
Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next
* 'for-next' of git://gitorious.org/usb/usb: usb: musb: gadget: prevent a NULL pointer dereference usb: musb: add names for IRQs in structure resource usb: musb: remove board_data parameter from musb_platform_init()
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/blackfin.c2
-rw-r--r--drivers/usb/musb/cppi_dma.c2
-rw-r--r--drivers/usb/musb/davinci.c2
-rw-r--r--drivers/usb/musb/musb_core.c4
-rw-r--r--drivers/usb/musb/musb_core.h2
-rw-r--r--drivers/usb/musb/musb_gadget.c13
-rw-r--r--drivers/usb/musb/musbhsdma.c2
-rw-r--r--drivers/usb/musb/omap2430.c6
-rw-r--r--drivers/usb/musb/tusb6010.c2
9 files changed, 20 insertions, 15 deletions
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 611a9d274363..e8cbcc59c419 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -323,7 +323,7 @@ int musb_platform_set_mode(struct musb *musb, u8 musb_mode)
323 return -EIO; 323 return -EIO;
324} 324}
325 325
326int __init musb_platform_init(struct musb *musb, void *board_data) 326int __init musb_platform_init(struct musb *musb)
327{ 327{
328 328
329 /* 329 /*
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index f5a65ff0ac2b..de55a3c3259a 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -1308,7 +1308,7 @@ dma_controller_create(struct musb *musb, void __iomem *mregs)
1308 struct cppi *controller; 1308 struct cppi *controller;
1309 struct device *dev = musb->controller; 1309 struct device *dev = musb->controller;
1310 struct platform_device *pdev = to_platform_device(dev); 1310 struct platform_device *pdev = to_platform_device(dev);
1311 int irq = platform_get_irq(pdev, 1); 1311 int irq = platform_get_irq_byname(pdev, "dma");
1312 1312
1313 controller = kzalloc(sizeof *controller, GFP_KERNEL); 1313 controller = kzalloc(sizeof *controller, GFP_KERNEL);
1314 if (!controller) 1314 if (!controller)
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 6e67629f50cc..051e2bf1897a 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb *musb, u8 mode)
376 return -EIO; 376 return -EIO;
377} 377}
378 378
379int __init musb_platform_init(struct musb *musb, void *board_data) 379int __init musb_platform_init(struct musb *musb)
380{ 380{
381 void __iomem *tibase = musb->ctrl_base; 381 void __iomem *tibase = musb->ctrl_base;
382 u32 revision; 382 u32 revision;
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index c9f9024c5515..a5ceddfe57d6 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2025,7 +2025,7 @@ bad_config:
2025 * isp1504, non-OTG, etc) mostly hooking up through ULPI. 2025 * isp1504, non-OTG, etc) mostly hooking up through ULPI.
2026 */ 2026 */
2027 musb->isr = generic_interrupt; 2027 musb->isr = generic_interrupt;
2028 status = musb_platform_init(musb, plat->board_data); 2028 status = musb_platform_init(musb);
2029 if (status < 0) 2029 if (status < 0)
2030 goto fail2; 2030 goto fail2;
2031 2031
@@ -2206,7 +2206,7 @@ static u64 *orig_dma_mask;
2206static int __init musb_probe(struct platform_device *pdev) 2206static int __init musb_probe(struct platform_device *pdev)
2207{ 2207{
2208 struct device *dev = &pdev->dev; 2208 struct device *dev = &pdev->dev;
2209 int irq = platform_get_irq(pdev, 0); 2209 int irq = platform_get_irq_byname(pdev, "mc");
2210 int status; 2210 int status;
2211 struct resource *iomem; 2211 struct resource *iomem;
2212 void __iomem *base; 2212 void __iomem *base;
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 69797e5b46a7..6ad72f395e28 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -614,7 +614,7 @@ extern int musb_platform_get_vbus_status(struct musb *musb);
614#define musb_platform_get_vbus_status(x) 0 614#define musb_platform_get_vbus_status(x) 0
615#endif 615#endif
616 616
617extern int __init musb_platform_init(struct musb *musb, void *board_data); 617extern int __init musb_platform_init(struct musb *musb);
618extern int musb_platform_exit(struct musb *musb); 618extern int musb_platform_exit(struct musb *musb);
619 619
620#endif /* __MUSB_CORE_H__ */ 620#endif /* __MUSB_CORE_H__ */
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 5d815049cbaa..edff014edd3a 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1072,13 +1072,16 @@ struct usb_request *musb_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
1072 struct musb_request *request = NULL; 1072 struct musb_request *request = NULL;
1073 1073
1074 request = kzalloc(sizeof *request, gfp_flags); 1074 request = kzalloc(sizeof *request, gfp_flags);
1075 if (request) { 1075 if (!request) {
1076 INIT_LIST_HEAD(&request->request.list); 1076 DBG(4, "not enough memory\n");
1077 request->request.dma = DMA_ADDR_INVALID; 1077 return NULL;
1078 request->epnum = musb_ep->current_epnum;
1079 request->ep = musb_ep;
1080 } 1078 }
1081 1079
1080 INIT_LIST_HEAD(&request->request.list);
1081 request->request.dma = DMA_ADDR_INVALID;
1082 request->epnum = musb_ep->current_epnum;
1083 request->ep = musb_ep;
1084
1082 return &request->request; 1085 return &request->request;
1083} 1086}
1084 1087
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 6f771af5cbdb..4e8183589624 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -363,7 +363,7 @@ dma_controller_create(struct musb *musb, void __iomem *base)
363 struct musb_dma_controller *controller; 363 struct musb_dma_controller *controller;
364 struct device *dev = musb->controller; 364 struct device *dev = musb->controller;
365 struct platform_device *pdev = to_platform_device(dev); 365 struct platform_device *pdev = to_platform_device(dev);
366 int irq = platform_get_irq(pdev, 1); 366 int irq = platform_get_irq_byname(pdev, "dma");
367 367
368 if (irq == 0) { 368 if (irq == 0) {
369 dev_err(dev, "No DMA interrupt line!\n"); 369 dev_err(dev, "No DMA interrupt line!\n");
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ed618bde1eec..27dabcf0a868 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -187,10 +187,12 @@ int musb_platform_set_mode(struct musb *musb, u8 musb_mode)
187 return 0; 187 return 0;
188} 188}
189 189
190int __init musb_platform_init(struct musb *musb, void *board_data) 190int __init musb_platform_init(struct musb *musb)
191{ 191{
192 u32 l; 192 u32 l;
193 struct omap_musb_board_data *data = board_data; 193 struct device *dev = musb->controller;
194 struct musb_hdrc_platform_data *plat = dev->platform_data;
195 struct omap_musb_board_data *data = plat->board_data;
194 196
195 /* We require some kind of external transceiver, hooked 197 /* We require some kind of external transceiver, hooked
196 * up through ULPI. TWL4030-family PMICs include one, 198 * up through ULPI. TWL4030-family PMICs include one,
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index bde40efc7046..41b04b906ce1 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -1091,7 +1091,7 @@ err:
1091 return -ENODEV; 1091 return -ENODEV;
1092} 1092}
1093 1093
1094int __init musb_platform_init(struct musb *musb, void *board_data) 1094int __init musb_platform_init(struct musb *musb)
1095{ 1095{
1096 struct platform_device *pdev; 1096 struct platform_device *pdev;
1097 struct resource *mem; 1097 struct resource *mem;