Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

diff --combined drivers/usb/wusbcore/rh.c
index 407a9fcc89ccd3f8bd4ab53809ae50191c1cd7f5,3937bf6f8cefcb4fdf3a9e7ec07eb70058f335d5..9fe4246cecb98d5bb5fa2cb77ca23bd3bae90c9e
--- 1/drivers/usb/wusbcore/rh.c
--- 2/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@@ -100,9 -100,6 +100,9 @@@ static int wusbhc_rh_port_reset(struct 
        struct wusb_port *port = wusb_port_by_idx(wusbhc, port_idx);
        struct wusb_dev *wusb_dev = port->wusb_dev;
  
 +      if (wusb_dev == NULL)
 +              return -ENOTCONN;
 +
        port->status |= USB_PORT_STAT_RESET;
        port->change |= USB_PORT_STAT_C_RESET;
  
@@@ -329,7 -326,7 +329,7 @@@ static int wusbhc_rh_clear_port_feat(st
  static int wusbhc_rh_get_port_status(struct wusbhc *wusbhc, u16 port_idx,
                                     u32 *_buf, u16 wLength)
  {
-       u16 *buf = (u16 *) _buf;
+       __le16 *buf = (__le16 *)_buf;
  
        if (port_idx > wusbhc->ports_max)
                return -EINVAL;