xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/can/Kconfig
This commit is contained in:
David S. Miller
2009-11-17 00:05:02 -08:00
parent 5c427ff9e4 82b3cc1a2f
commit a2bfbc072e
32 changed files with 363 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/p54/p54usb.c
View File

@@ -426,12 +426,16 @@ static const char p54u_romboot_3887[] = "~~~~";
static int p54u_firmware_reset_3887(struct ieee80211_hw *dev)
{
struct p54u_priv *priv = dev->priv;
u8 buf[4];
u8 *buf;
int ret;
memcpy(&buf, p54u_romboot_3887, sizeof(buf));
buf = kmalloc(4, GFP_KERNEL);
if (!buf)
return -ENOMEM;
memcpy(buf, p54u_romboot_3887, 4);
ret = p54u_bulk_msg(priv, P54U_PIPE_DATA,
buf, sizeof(buf));
buf, 4);
kfree(buf);
if (ret)
dev_err(&priv->udev->dev, "(p54usb) unable to jump to "
"boot ROM (%d)!\n", ret);