Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / drivers / usb / musb / musb_host.c

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 3df6a76b851dbefc91c6d5488570f9d53813a59b..e9f0fd9ddd2d05284283ee3448785984cc760c10 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -740,7 +740,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                csr = musb_readw(epio, MUSB_TXCSR);
 
                /* disable interrupt in case we flush */
-               int_txe = musb_readw(mbase, MUSB_INTRTXE);
+               int_txe = musb->intrtxe;
                musb_writew(mbase, MUSB_INTRTXE, int_txe & ~(1 << epnum));
 
                /* general endpoint setup */