Attachment 159404 Details for Bug 242638 – Candidate patch 1

[patch] Candidate patch 1

linux-2.6.23-p54u-dma1.diff (text/plain), 1.48 KB, created by Pete Zaitcev on 2007-07-17 06:08:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2007-07-17 06:08:48 UTC

Size: 1.48 KB

patch

obsolete

>diff -urp -X dontdiff linux-2.6.23-0.15.rc0.git1.fc8/drivers/net/wireless/mac80211/p54/prism54usb.c linux-2.6.23-0.15.rc0.git1.fc8-p54u/drivers/net/wireless/mac80211/p54/prism54usb.c
>--- linux-2.6.23-0.15.rc0.git1.fc8/drivers/net/wireless/mac80211/p54/prism54usb.c	2007-07-16 20:16:00.000000000 -0700
>+++ linux-2.6.23-0.15.rc0.git1.fc8-p54u/drivers/net/wireless/mac80211/p54/prism54usb.c	2007-07-16 22:07:33.000000000 -0700
>@@ -375,22 +375,23 @@ static int p54u_upload_firmware_3887(str
> 	struct x2_header *hdr;
> 	unsigned long timeout;
> 
>-	err = p54u_bulk_msg(priv, P54U_PIPE_DATA, start_string, 4);
>-	if (err) {
>-		printk(KERN_ERR "p54usb: reset failed!\n");
>-		return err;
>-	}
>-
> 	tmp = buf = kmalloc(P54U_FW_BLOCK, GFP_KERNEL);
> 	if (!buf) {
> 		printk(KERN_ERR "p54usb: cannot allocate firmware upload buffer!\n");
>-		return -ENOMEM;
>+		err = -ENOMEM;
>+		goto err_bufalloc;
>+	}
>+
>+	memcpy(buf, start_string, 4);
>+	if ((err = p54u_bulk_msg(priv, P54U_PIPE_DATA, buf, 4)) != 0) {
>+		printk(KERN_ERR "p54usb: reset failed! (%d)\n", err);
>+		goto err_reset;
> 	}
> 
> 	err = request_firmware(&fw_entry, "isl3887usb_bare", &priv->udev->dev);
> 	if (err) {
> 		printk(KERN_ERR "p54usb: cannot find firmware (isl3887usb_bare)!\n");
>-		return err;
>+		goto err_req_fw_failed;
> 	}
> 
> 	p54_parse_firmware(dev, fw_entry);
>@@ -499,7 +500,10 @@ static int p54u_upload_firmware_3887(str
> 
>   err_upload_failed:
> 	release_firmware(fw_entry);
>+  err_req_fw_failed:
>+  err_reset:
> 	kfree(buf);
>+  err_bufalloc:
> 	return err;
> }
>

Actions: View | Diff

Attachments on bug 242638: 156269 | 159236 | 159404