From f6ace2c99afefb7969ccccba2fb413ad29ab2e2e Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda Date: Wed, 30 May 2007 20:42:41 +0900 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/r8a66597-hcd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index af13f1f229..a7a7070c6e 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)); } -- 2.39.5