From 05a85b07e148fea3fe6803f278560bfaea9a10c0 Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda Date: Wed, 30 May 2007 20:42:41 +0900 Subject: [PATCH] --- yaml --- r: 59379 b: refs/heads/master c: f6ace2c99afefb7969ccccba2fb413ad29ab2e2e h: refs/heads/master i: 59377: 8495c83148cbe7243f517fd0d8a998e1955d8a63 59375: 656532b0267585017c0e79203c8d08e088284834 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/r8a66597-hcd.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d47eeee76b92..749877a5414b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d3043586db428b5b4b3df89fa0c2db9731e934c +refs/heads/master: f6ace2c99afefb7969ccccba2fb413ad29ab2e2e diff --git a/trunk/drivers/usb/host/r8a66597-hcd.c b/trunk/drivers/usb/host/r8a66597-hcd.c index af13f1f2296a..a7a7070c6e2a 100644 --- a/trunk/drivers/usb/host/r8a66597-hcd.c +++ b/trunk/drivers/usb/host/r8a66597-hcd.c @@ -47,7 +47,7 @@ MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Yoshihiro Shimoda"); -#define DRIVER_VERSION "9 May 2007" +#define DRIVER_VERSION "29 May 2007" static const char hcd_name[] = "r8a66597_hcd"; @@ -544,6 +544,9 @@ static void pipe_toggle_restore(struct r8a66597 *r8a66597, unsigned char endpoint = usb_pipeendpoint(urb->pipe); unsigned short *toggle = get_toggle_pointer(dev, urb->pipe); + if (!toggle) + return; + r8a66597_pipe_toggle(r8a66597, pipe, *toggle & (1 << endpoint)); }