Commit 0d1d1424 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

Staging: at76_usb: cleanup dma on stack issues

- no DMA on stack
- cleanup unclear endianness issue
Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66664462
...@@ -590,18 +590,25 @@ static int at76_remap(struct usb_device *udev) ...@@ -590,18 +590,25 @@ static int at76_remap(struct usb_device *udev)
static int at76_get_op_mode(struct usb_device *udev) static int at76_get_op_mode(struct usb_device *udev)
{ {
int ret; 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, ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,
USB_TYPE_VENDOR | USB_DIR_IN | 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); USB_CTRL_GET_TIMEOUT);
saved = *op_mode;
kfree(op_mode);
if (ret < 0) if (ret < 0)
return ret; return ret;
else if (ret < 1) else if (ret < 1)
return -EIO; return -EIO;
else else
return op_mode; return saved;
} }
/* Load a block of the second ("external") part of the firmware */ /* Load a block of the second ("external") part of the firmware */
...@@ -714,17 +721,22 @@ static inline int at76_get_mib(struct usb_device *udev, u16 mib, void *buf, ...@@ -714,17 +721,22 @@ static inline int at76_get_mib(struct usb_device *udev, u16 mib, void *buf,
/* Return positive number for status, negative for an error */ /* Return positive number for status, negative for an error */
static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd) static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
{ {
u8 stat_buf[40]; u8 *stat_buf;
int ret; int ret;
stat_buf = kmalloc(40, GFP_NOIO);
if (!stat_buf)
return -ENOMEM;
ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22, ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22,
USB_TYPE_VENDOR | USB_DIR_IN | USB_TYPE_VENDOR | USB_DIR_IN |
USB_RECIP_INTERFACE, cmd, 0, stat_buf, USB_RECIP_INTERFACE, cmd, 0, stat_buf,
sizeof(stat_buf), USB_CTRL_GET_TIMEOUT); sizeof(stat_buf), USB_CTRL_GET_TIMEOUT);
if (ret < 0) if (ret >= 0)
return ret; ret = stat_buf[5];
kfree(stat_buf);
return stat_buf[5]; return ret;
} }
#define MAKE_CMD_CASE(c) case (c): return #c #define MAKE_CMD_CASE(c) case (c): return #c
...@@ -745,7 +757,7 @@ static const char *at76_get_cmd_string(u8 cmd_status) ...@@ -745,7 +757,7 @@ static const char *at76_get_cmd_string(u8 cmd_status)
return "UNKNOWN"; return "UNKNOWN";
} }
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 buf_size)
{ {
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment