Merge branch '2.6.23' into 2.6.22.6-imx27

Conflicts:

	Documentation/kernel-parameters.txt
	Makefile
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-mx3/Kconfig
	arch/arm/mach-mx3/Makefile
	arch/arm/mach-mx3/mm.c
	arch/arm/mach-mx3/mx31ads.c
	arch/arm/mm/Kconfig
	arch/arm/plat-mxc/Kconfig
	arch/arm/plat-mxc/Makefile
	arch/arm/plat-mxc/irq.c
	block/cfq-iosched.c
	drivers/ata/ahci.c
	drivers/ata/libata-core.c
	drivers/char/watchdog/Kconfig
	drivers/firewire/fw-sbp2.c
	drivers/md/dm-crypt.c
	drivers/media/video/pwc/pwc-if.c
	drivers/mmc/card/Kconfig
	drivers/mmc/card/queue.c
	drivers/mmc/core/Makefile
	drivers/mmc/core/bus.c
	drivers/mmc/core/core.c
	drivers/mmc/core/host.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
	drivers/mmc/core/sd_ops.c
	drivers/mmc/host/at91_mci.c
	drivers/mmc/host/sdhci.c
	drivers/net/bonding/bond_main.c
	drivers/net/fec.c
	drivers/net/forcedeth.c
	drivers/net/r8169.c
	drivers/net/sky2.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/spi/Kconfig
	drivers/spi/Makefile
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/gadget_chips.h
	drivers/usb/host/ehci.h
	drivers/video/logo/logo.c
	drivers/w1/slaves/Makefile
	fs/9p/conv.c
	fs/direct-io.c
	fs/exec.c
	fs/ocfs2/file.c
	fs/signalfd.c
	fs/sysfs/file.c
	include/asm-arm/arch-mxc/dma.h
	include/asm-arm/arch-mxc/entry-macro.S
	include/asm-arm/arch-mxc/hardware.h
	include/asm-arm/arch-mxc/io.h
	include/asm-arm/arch-mxc/irqs.h
	include/asm-arm/arch-mxc/memory.h
	include/asm-arm/arch-mxc/mx31.h
	include/asm-arm/arch-mxc/mxc.h
	include/asm-arm/arch-mxc/system.h
	include/asm-arm/arch-mxc/timex.h
	include/asm-arm/arch-mxc/uncompress.h
	include/asm-arm/arch-mxc/vmalloc.h
	include/linux/fsl_devices.h
	include/linux/ioprio.h
	kernel/lockdep_proc.c
	kernel/signal.c
	mm/hugetlb.c
	mm/readahead.c
	net/bluetooth/rfcomm/tty.c
	net/bridge/br_device.c
	net/core/dev.c
	net/ieee80211/softmac/ieee80211softmac_assoc.c
	net/ieee80211/softmac/ieee80211softmac_wx.c
	net/ipv4/netfilter/nf_conntrack_proto_icmp.c
	net/ipv4/tcp_input.c
	net/netfilter/nf_conntrack_proto_sctp.c

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index 5727e1ea2f91..df0ebcdb9d6a 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -95,9 +95,10 @@ static void motorcontrol_irq(struct urb *urb)
 	struct motorcontrol *mc = urb->context;
 	unsigned char *buffer = mc->data;
 	int i, level;
-	int status;
+	int retval;
+	int status = urb->status;;
 
-	switch (urb->status) {
+	switch (status) {
 	case 0:			/* success */
 		break;
 	case -ECONNRESET:	/* unlink */
@@ -151,12 +152,12 @@ static void motorcontrol_irq(struct urb *urb)
 		schedule_delayed_work(&mc->do_notify, 0);
 
 resubmit:
-	status = usb_submit_urb(urb, GFP_ATOMIC);
-	if (status)
+	retval = usb_submit_urb(urb, GFP_ATOMIC);
+	if (retval)
 		dev_err(&mc->intf->dev,
-			"can't resubmit intr, %s-%s/motorcontrol0, status %d",
+			"can't resubmit intr, %s-%s/motorcontrol0, retval %d",
 			mc->udev->bus->bus_name,
-			mc->udev->devpath, status);
+			mc->udev->devpath, retval);
 }
 
 static void do_notify(struct work_struct *work)