More USB patches for 3.6-rc3
Here are 10 more USB patches for 3.6-rc3. They all fix reported problems (build problems for one of them, and easily repeatable oopses for the others.) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAlAyjj4ACgkQMUfUDdst+yn8gQCgkNpc92Ux5hBYJIX/AQYoBrTB ktAAoLiXxIhVP+D4C42R1VLw9vGeB1QH =+8kb -----END PGP SIGNATURE----- Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull more USB patches from Greg Kroah-Hartman: "Here are 10 more USB patches for 3.6-rc3. They all fix reported problems (build problems for one of them, and easily repeatable oopses for the others.) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: gpu/mfd/usb: Fix USB randconfig problems USB: CDC ACM: Fix NULL pointer dereference USB: emi62: remove __devinit* from the struct usb_device_id table USB: winbond: remove __devinit* from the struct usb_device_id table USB: vt6656: remove __devinit* from the struct usb_device_id table USB: rtl8187: remove __devinit* from the struct usb_device_id table USB: p54usb: remove __devinit* from the struct usb_device_id table USB: spca506: remove __devinit* from the struct usb_device_id table USB: jl2005bcd: remove __devinit* from the struct usb_device_id table USB: smsusb: remove __devinit* from the struct usb_device_id table
This commit is contained in:
commit
10c63c9aec
|
@ -22,6 +22,7 @@ menuconfig DRM
|
|||
config DRM_USB
|
||||
tristate
|
||||
depends on DRM
|
||||
depends on USB_ARCH_HAS_HCD
|
||||
select USB
|
||||
|
||||
config DRM_KMS_HELPER
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
config DRM_UDL
|
||||
tristate "DisplayLink"
|
||||
depends on DRM && EXPERIMENTAL
|
||||
depends on USB_ARCH_HAS_HCD
|
||||
select DRM_USB
|
||||
select FB_SYS_FILLRECT
|
||||
select FB_SYS_COPYAREA
|
||||
|
|
|
@ -481,7 +481,7 @@ static int smsusb_resume(struct usb_interface *intf)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const struct usb_device_id smsusb_id_table[] __devinitconst = {
|
||||
static const struct usb_device_id smsusb_id_table[] = {
|
||||
{ USB_DEVICE(0x187f, 0x0010),
|
||||
.driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
|
||||
{ USB_DEVICE(0x187f, 0x0100),
|
||||
|
|
|
@ -512,7 +512,7 @@ static const struct sd_desc sd_desc = {
|
|||
};
|
||||
|
||||
/* -- module initialisation -- */
|
||||
static const __devinitdata struct usb_device_id device_table[] = {
|
||||
static const struct usb_device_id device_table[] = {
|
||||
{USB_DEVICE(0x0979, 0x0227)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -579,7 +579,7 @@ static const struct sd_desc sd_desc = {
|
|||
};
|
||||
|
||||
/* -- module initialisation -- */
|
||||
static const struct usb_device_id device_table[] __devinitconst = {
|
||||
static const struct usb_device_id device_table[] = {
|
||||
{USB_DEVICE(0x06e1, 0xa190)},
|
||||
/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505
|
||||
{USB_DEVICE(0x0733, 0x0430)}, */
|
||||
|
|
|
@ -395,7 +395,8 @@ config MFD_TC6387XB
|
|||
|
||||
config MFD_TC6393XB
|
||||
bool "Support Toshiba TC6393XB"
|
||||
depends on GPIOLIB && ARM && HAVE_CLK
|
||||
depends on ARM && HAVE_CLK
|
||||
select GPIOLIB
|
||||
select MFD_CORE
|
||||
select MFD_TMIO
|
||||
help
|
||||
|
|
|
@ -42,7 +42,7 @@ MODULE_FIRMWARE("isl3887usb");
|
|||
* whenever you add a new device.
|
||||
*/
|
||||
|
||||
static struct usb_device_id p54u_table[] __devinitdata = {
|
||||
static struct usb_device_id p54u_table[] = {
|
||||
/* Version 1 devices (pci chip + net2280) */
|
||||
{USB_DEVICE(0x0411, 0x0050)}, /* Buffalo WLI2-USB2-G54 */
|
||||
{USB_DEVICE(0x045e, 0x00c2)}, /* Microsoft MN-710 */
|
||||
|
|
|
@ -44,7 +44,7 @@ MODULE_AUTHOR("Larry Finger <Larry.Finger@lwfinger.net>");
|
|||
MODULE_DESCRIPTION("RTL8187/RTL8187B USB wireless driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static struct usb_device_id rtl8187_table[] __devinitdata = {
|
||||
static struct usb_device_id rtl8187_table[] = {
|
||||
/* Asus */
|
||||
{USB_DEVICE(0x0b05, 0x171d), .driver_info = DEVICE_RTL8187},
|
||||
/* Belkin */
|
||||
|
|
|
@ -189,7 +189,7 @@ DEVICE_PARAM(b80211hEnable, "802.11h mode");
|
|||
// Static vars definitions
|
||||
//
|
||||
|
||||
static struct usb_device_id vt6656_table[] __devinitdata = {
|
||||
static struct usb_device_id vt6656_table[] = {
|
||||
{USB_DEVICE(VNT_USB_VENDOR_ID, VNT_USB_PRODUCT_ID)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -25,7 +25,7 @@ MODULE_DESCRIPTION("IS89C35 802.11bg WLAN USB Driver");
|
|||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION("0.1");
|
||||
|
||||
static const struct usb_device_id wb35_table[] __devinitconst = {
|
||||
static const struct usb_device_id wb35_table[] = {
|
||||
{ USB_DEVICE(0x0416, 0x0035) },
|
||||
{ USB_DEVICE(0x18E8, 0x6201) },
|
||||
{ USB_DEVICE(0x18E8, 0x6206) },
|
||||
|
|
|
@ -13,7 +13,7 @@ config USB_ARCH_HAS_OHCI
|
|||
default y if PXA3xx
|
||||
default y if ARCH_EP93XX
|
||||
default y if ARCH_AT91
|
||||
default y if ARCH_PNX4008 && I2C
|
||||
default y if ARCH_PNX4008
|
||||
default y if MFD_TC6393XB
|
||||
default y if ARCH_W90X900
|
||||
default y if ARCH_DAVINCI_DA8XX
|
||||
|
|
|
@ -1104,7 +1104,8 @@ skip_normal_probe:
|
|||
}
|
||||
|
||||
|
||||
if (data_interface->cur_altsetting->desc.bNumEndpoints < 2)
|
||||
if (data_interface->cur_altsetting->desc.bNumEndpoints < 2 ||
|
||||
control_interface->cur_altsetting->desc.bNumEndpoints == 0)
|
||||
return -EINVAL;
|
||||
|
||||
epctrl = &control_interface->cur_altsetting->endpoint[0].desc;
|
||||
|
|
|
@ -232,7 +232,7 @@ wraperr:
|
|||
return err;
|
||||
}
|
||||
|
||||
static const struct usb_device_id id_table[] __devinitconst = {
|
||||
static const struct usb_device_id id_table[] = {
|
||||
{ USB_DEVICE(EMI62_VENDOR_ID, EMI62_PRODUCT_ID) },
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue