From b61eb7eece3c4a38b765183079d03663d940a5ca Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Jul 2007 10:58:02 -0700 Subject: [PATCH] --- yaml --- r: 61943 b: refs/heads/master c: 9a5a3e95b49c93813476974abaa038c9d36bdd14 h: refs/heads/master i: 61941: f5c3efed2ba80fd77c68a3186be833e1c0db6d9d 61939: 26e5767d1327807dc9168ea4ab6a814c827f30fd 61935: eb4def7f1f2c7a92d00949d808978157d2160c8d v: v3 --- [refs] | 2 +- trunk/drivers/usb/atm/speedtch.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fb0a892062e1..f63c42e7041b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c35f68a05d0916e89ae2aab1a456f96fea9190cd +refs/heads/master: 9a5a3e95b49c93813476974abaa038c9d36bdd14 diff --git a/trunk/drivers/usb/atm/speedtch.c b/trunk/drivers/usb/atm/speedtch.c index 638b8009b3bc..eb0615abff68 100644 --- a/trunk/drivers/usb/atm/speedtch.c +++ b/trunk/drivers/usb/atm/speedtch.c @@ -612,7 +612,8 @@ static void speedtch_handle_int(struct urb *int_urb) struct speedtch_instance_data *instance = int_urb->context; struct usbatm_data *usbatm = instance->usbatm; unsigned int count = int_urb->actual_length; - int ret = int_urb->status; + int status = int_urb->status; + int ret; /* The magic interrupt for "up state" */ static const unsigned char up_int[6] = { 0xa1, 0x00, 0x01, 0x00, 0x00, 0x00 }; @@ -621,8 +622,8 @@ static void speedtch_handle_int(struct urb *int_urb) atm_dbg(usbatm, "%s entered\n", __func__); - if (ret < 0) { - atm_dbg(usbatm, "%s: nonzero urb status %d!\n", __func__, ret); + if (status < 0) { + atm_dbg(usbatm, "%s: nonzero urb status %d!\n", __func__, status); goto fail; }