summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-21 08:40:22 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-21 08:40:22 -0700
commitd93acbcacdec04dbdab0d1cc35457eb3bf1d2a38 (patch)
treed05361d334d2d1035abf249031febebaa1766829 /include
parentd714aaf649460cbfd5e82e75520baa856b4fa0a0 (diff)
parenteda81bea894e5cd945e30f85b00546caf80fbecc (diff)
downloadlinux-stable-d93acbcacdec04dbdab0d1cc35457eb3bf1d2a38.tar.gz
linux-stable-d93acbcacdec04dbdab0d1cc35457eb3bf1d2a38.tar.bz2
linux-stable-d93acbcacdec04dbdab0d1cc35457eb3bf1d2a38.zip
Merge tag 'fixes-for-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fixes for v3.9-rc4 udc-core learned that it shouldn't use invalid pointers when unloading a gadget driver. net2272 and net2280 got a fix for a regression caused by the udc_start/udc_stop conversion. We're defining a static inline no-op for otg_ulpi_create() to prevent build errors when that driver isn't enabled. FunctionFS got a fix for an off-by-one error when binding and unbinding instances of FunctionFS. MUSB learned that it shouldn't try to unmap buffers which weren't previously mapped. f_rndis got a fix for a possible NULL pointer dereference in a debugging message code. MUSB's DA8xx glue layer got a build fix due to a typo.
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/ulpi.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/usb/ulpi.h b/include/linux/usb/ulpi.h
index 6f033a415ecb..5c295c26ad37 100644
--- a/include/linux/usb/ulpi.h
+++ b/include/linux/usb/ulpi.h
@@ -181,8 +181,16 @@
/*-------------------------------------------------------------------------*/
+#if IS_ENABLED(CONFIG_USB_ULPI)
struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,
unsigned int flags);
+#else
+static inline struct usb_phy *otg_ulpi_create(struct usb_phy_io_ops *ops,
+ unsigned int flags)
+{
+ return NULL;
+}
+#endif
#ifdef CONFIG_USB_ULPI_VIEWPORT
/* access ops for controllers with a viewport register */