From: Greg Kroah-Hartman <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
zd_chip.c | 6 ++++--
zd_mac.c | 6 ++++--
zd_usb.c | 39 ++++++++++++++++++++++++++-------------
3 files changed, 34 insertions(+), 17 deletions(-)
d511d0f25c5f190288e17ec61a00f1724f83bc00
diff --git a/zd_chip.c b/zd_chip.c
index 7b1355a..7fdb082 100644
--- a/zd_chip.c
+++ b/zd_chip.c
@@ -101,7 +101,8 @@ int zd_ioread32v_locked(struct zd_chip *
GFP_NOFS);
if (!a16) {
PDEBUGF("error ENOMEM in allocation of a16");
- r = -ENOMEM; goto out;
+ r = -ENOMEM;
+ goto out;
}
v16 = (u16 *)(a16 + count16);
@@ -1322,7 +1323,8 @@ int zd_chip_led_status(struct zd_chip *c
}
r = write_led_reg(chip, reg);
if (r) {
- ret = r; goto out;
+ ret = r;
+ goto out;
}
out:
mutex_unlock(&chip->mutex);
diff --git a/zd_mac.c b/zd_mac.c
index 73974ab..bf72195 100644
--- a/zd_mac.c
+++ b/zd_mac.c
@@ -58,7 +58,8 @@ static int reset_channel(struct zd_mac *
spin_lock_irqsave(&mac->lock, flags);
range = zd_channel_range(mac->regdomain);
if (!range->start) {
- r = -EINVAL; goto out;
+ r = -EINVAL;
+ goto out;
}
mac->requested_channel = range->start;
r = 0;
@@ -96,7 +97,8 @@ int zd_mac_init_hw(struct zd_mac *mac)
if (!zd_regdomain_supported(default_regdomain)) {
PERROR("Regulatory Domain %#04x is not supported.",
default_regdomain);
- r = -EINVAL; goto disable_int;
+ r = -EINVAL;
+ goto disable_int;
}
spin_lock_irq(&mac->lock);
mac->regdomain = mac->default_regdomain = default_regdomain;
diff --git a/zd_usb.c b/zd_usb.c
index 0c4604b..e4e5189 100644
--- a/zd_usb.c
+++ b/zd_usb.c
@@ -185,7 +185,8 @@ static int upload_code(struct usb_device
p = kmalloc(MAX_TRANSFER_SIZE, GFP_KERNEL);
if (!p) {
PERROR("out of memory");
- r = -ENOMEM; goto error;
+ r = -ENOMEM;
+ goto error;
}
size &= ~1;
@@ -230,7 +231,8 @@ static int upload_code(struct usb_device
PERROR("Internal error while downloading."
" Firmware confirm return value %#04x",
(unsigned int)ret);
- r = -ENODEV; goto error;
+ r = -ENODEV;
+ goto error;
}
PDEBUGF("firmware confirm return value %#04x",
(unsigned int)ret);
@@ -455,14 +457,16 @@ int zd_usb_enable_int(struct zd_usb *usb
urb = usb_alloc_urb(0, GFP_NOFS);
if (!urb) {
- r = -ENOMEM; goto out;
+ r = -ENOMEM;
+ goto out;
}
ZD_ASSERT(!irqs_disabled());
spin_lock_irq(&intr->lock);
if (intr->urb) {
spin_unlock_irq(&intr->lock);
- r = 0; goto error_free_urb;
+ r = 0;
+ goto error_free_urb;
}
intr->urb = urb;
spin_unlock_irq(&intr->lock);
@@ -677,7 +681,8 @@ int zd_usb_enable_rx(struct zd_usb *usb)
spin_lock_irq(&rx->lock);
if (rx->urbs) {
spin_unlock_irq(&rx->lock);
- r = 0; goto error;
+ r = 0;
+ goto error;
}
rx->urbs = urbs;
rx->urbs_count = URBS_COUNT;
@@ -780,13 +785,15 @@ int zd_usb_tx(struct zd_usb *usb, const
urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) {
- r = -ENOMEM; goto out;
+ r = -ENOMEM;
+ goto out;
}
buffer = usb_buffer_alloc(zd_usb_to_usbdev(usb), length, GFP_ATOMIC,
&urb->transfer_dma);
if (!buffer) {
- r = -ENOMEM; goto error_free_urb;
+ r = -ENOMEM;
+ goto error_free_urb;
}
memcpy(buffer, frame, length);
@@ -925,12 +932,14 @@ static int probe(struct usb_interface *i
break;
default:
PDEBUGF("Unknown USB speed");
- r = -ENODEV; goto error;
+ r = -ENODEV;
+ goto error;
}
netdev = zd_netdev_alloc(intf);
if (netdev == NULL) {
- r = -ENOMEM; goto error;
+ r = -ENOMEM;
+ goto error;
}
r = upload_firmware(udev);
@@ -1139,7 +1148,8 @@ int zd_usb_ioread16v(struct zd_usb *usb,
PDEBUGF("error in usb_bulk_msg()"
" req_len %d != actual_req_len %d",
req_len, actual_req_len);
- r = -EIO; goto error;
+ r = -EIO;
+ goto error;
}
timeout = wait_for_completion_timeout(&usb->intr.read_regs.completion,
@@ -1147,7 +1157,8 @@ int zd_usb_ioread16v(struct zd_usb *usb,
if (!timeout) {
disable_read_regs_int(usb);
PDEBUGF("read timed out");
- r = -ETIMEDOUT; goto error;
+ r = -ETIMEDOUT;
+ goto error;
}
r = get_results(usb, values, req, count);
@@ -1200,7 +1211,8 @@ int zd_usb_iowrite16v(struct zd_usb *usb
PDEBUGF("error in usb_bulk_msg()"
" req_len %d != actual_req_len %d",
req_len, actual_req_len);
- r = -EIO; goto error;
+ r = -EIO;
+ goto error;
}
/* FALL-THROUGH with r == 0 */
@@ -1276,7 +1288,8 @@ #endif /* ZD1211_DEBUG */
PDEBUGF("error in usb_bulk_msg()"
" req_len %d != actual_req_len %d",
req_len, actual_req_len);
- r = -EIO; goto out;
+ r = -EIO;
+ goto out;
}
/* FALL-THROUGH with r == 0 */
--
1.3.1
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Zd1211-devs mailing list - http://zd1211.ath.cx/
Unsubscribe: https://lists.sourceforge.net/lists/listinfo/zd1211-devs
