summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/r8a66597-hcd.c
diff options
context:
space:
mode:
authorYoshihiro Shimoda <shimoda.yoshihiro@renesas.com>2007-05-30 13:42:41 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-13 01:29:45 +0200
commitf6ace2c99afefb7969ccccba2fb413ad29ab2e2e (patch)
treee8c2a22f2f2c6f2d8aec6ae6b06e623c4b686ec9 /drivers/usb/host/r8a66597-hcd.c
parentUSB: r8a66597-hcd: host controller driver for R8A66597 (diff)
downloadlinux-f6ace2c99afefb7969ccccba2fb413ad29ab2e2e.tar.xz
linux-f6ace2c99afefb7969ccccba2fb413ad29ab2e2e.zip
USB: r8a66597-hcd: fix NULL access
This patch fixes the problem that accesses NULL pointer when disconnected a cable while play music with usb-speaker. Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/r8a66597-hcd.c')
-rw-r--r--drivers/usb/host/r8a66597-hcd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index af13f1f2296a..a7a7070c6e2a 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/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));
}