From efc0e7b4c2241356dd15f8a6990ab5b8d5a22ea0 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 29 Dec 2008 11:23:47 +0100
Subject: [PATCH] --- yaml --- r: 133775 b: refs/heads/master c:
 2855d28a35d14e0087c48cb6f15d0446ea4c54c3 h: refs/heads/master i:   133773:
 850097dfeb362c28aba18dbb9435bccb8ffd3ca5   133771:
 47cfc0024ef0bd1ce33f721f90bec78d4e699afb   133767:
 2880fa0570f29ffb9926e3676a0f5f7e6c91cac4   133759:
 d58655d34b1f5c332766be34f9f7093f28186163 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/pcwd_usb.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 53b93f0e9663..96565dd42b4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e058d4f57751daa008b764735f97fdfccfeab6c
+refs/heads/master: 2855d28a35d14e0087c48cb6f15d0446ea4c54c3
diff --git a/trunk/drivers/watchdog/pcwd_usb.c b/trunk/drivers/watchdog/pcwd_usb.c
index afb089695da8..b5320a8e7451 100644
--- a/trunk/drivers/watchdog/pcwd_usb.c
+++ b/trunk/drivers/watchdog/pcwd_usb.c
@@ -609,9 +609,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
 	/* check out the endpoint: it has to be Interrupt & IN */
 	endpoint = &iface_desc->endpoint[0].desc;
 
-	if (!((endpoint->bEndpointAddress & USB_DIR_IN) &&
-	     ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-				== USB_ENDPOINT_XFER_INT))) {
+	if (!usb_endpoint_is_int_in(endpoint)) {
 		/* we didn't find a Interrupt endpoint with direction IN */
 		printk(KERN_ERR PFX "Couldn't find an INTR & IN endpoint\n");
 		return -ENODEV;