| From 656d2b3964a9d0f9864d472f8dfa2dd7dd42e6c0 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Tue, 28 Feb 2012 09:20:09 -0800 |
| Subject: USB: ftdi_sio: fix problem when the manufacture is a NULL string |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| commit 656d2b3964a9d0f9864d472f8dfa2dd7dd42e6c0 upstream. |
| |
| On some misconfigured ftdi_sio devices, if the manufacturer string is |
| NULL, the kernel will oops when the device is plugged in. This patch |
| fixes the problem. |
| |
| Reported-by: Wojciech M Zabolotny <W.Zabolotny@elka.pw.edu.pl> |
| Tested-by: Wojciech M Zabolotny <W.Zabolotny@elka.pw.edu.pl> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/ftdi_sio.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/serial/ftdi_sio.c |
| +++ b/drivers/usb/serial/ftdi_sio.c |
| @@ -1763,7 +1763,8 @@ static int ftdi_8u2232c_probe(struct usb |
| |
| dbg("%s", __func__); |
| |
| - if (strcmp(udev->manufacturer, "CALAO Systems") == 0) |
| + if ((udev->manufacturer) && |
| + (strcmp(udev->manufacturer, "CALAO Systems") == 0)) |
| return ftdi_jtag_probe(serial); |
| |
| return 0; |
