Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / drivers / staging / at76_usb / at76_usb.c

diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index 174e2bec922323775f9fefa99927bdc98bd71e1d..c8e4d31c7df2bd98debecee0ab6ac8d51fe2befa 100644 (file)
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -231,6 +231,8 @@ static struct usb_device_id dev_table[] = {
        {USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A)},
        /* Siemens Gigaset USB WLAN Adapter 11 */
        {USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A)},
+       /* OQO Model 01+ Internal Wi-Fi */
+       {USB_DEVICE(0x1557, 0x0002), USB_DEVICE_DATA(BOARD_505A)},
        /*
         * at76c505amx-rfmd
         */
@@ -641,18 +643,25 @@ static int at76_remap(struct usb_device *udev)
 static int at76_get_op_mode(struct usb_device *udev)
 {
        int ret;
-       u8 op_mode;
+       u8 saved;
+       u8 *op_mode;
 
+       op_mode = kmalloc(1, GFP_NOIO);
+       if (!op_mode)
+               return -ENOMEM;
        ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,
                              USB_TYPE_VENDOR | USB_DIR_IN |
-                             USB_RECIP_INTERFACE, 0x01, 0, &op_mode, 1,
+                             USB_RECIP_INTERFACE, 0x01, 0, op_mode, 1,
                              USB_CTRL_GET_TIMEOUT);
+       saved = *op_mode;
+       kfree(op_mode);
+
        if (ret < 0)
                return ret;
        else if (ret < 1)
                return -EIO;
        else
-               return op_mode;
+               return saved;
 }
 
 /* Load a block of the second ("external") part of the firmware */
@@ -765,20 +774,25 @@ static inline int at76_get_mib(struct usb_device *udev, u16 mib, void *buf,
 /* Return positive number for status, negative for an error */
 static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
 {
-       u8 stat_buf[40];
+       u8 *stat_buf;
        int ret;
 
+       stat_buf = kmalloc(40, GFP_NOIO);
+       if (!stat_buf)
+               return -ENOMEM;
+
        ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22,
                              USB_TYPE_VENDOR | USB_DIR_IN |
                              USB_RECIP_INTERFACE, cmd, 0, stat_buf,
-                             sizeof(stat_buf), USB_CTRL_GET_TIMEOUT);
-       if (ret < 0)
-               return ret;
+                             40, USB_CTRL_GET_TIMEOUT);
+       if (ret >= 0)
+               ret = stat_buf[5];
+       kfree(stat_buf);
 
-       return stat_buf[5];
+       return ret;
 }
 
-static int at76_set_card_command(struct usb_device *udev, int cmd, void *buf,
+static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf,
                                 int buf_size)
 {
        int ret;
@@ -5315,7 +5329,7 @@ static int at76_init_new_device(struct at76_priv *priv,
        priv->netdev_registered = 1;
 
        printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",
-              netdev->name, interface->dev.bus_id, mac2str(priv->mac_addr),
+              netdev->name, dev_name(&interface->dev), mac2str(priv->mac_addr),
               priv->fw_version.major, priv->fw_version.minor,
               priv->fw_version.patch, priv->fw_version.build);
        printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n", netdev->name,