summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-08-13 13:27:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-14 21:49:27 +0200
commitff8a43c10f1440f07a5faca0c1556921259f7f76 (patch)
tree80402017bf94acfa9418892f64483e5c9bf0590a /drivers/usb/serial
parentUSB: mos7720: fix broken control requests (diff)
downloadlinux-ff8a43c10f1440f07a5faca0c1556921259f7f76.tar.xz
linux-ff8a43c10f1440f07a5faca0c1556921259f7f76.zip
USB: keyspan: fix null-deref at disconnect and release
Make sure to fail properly if the device is not accepted during attach in order to avoid null-pointer derefs (of missing interface private data) at disconnect or release. Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/keyspan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 5a979729f8ec..58c17fdc85eb 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -2303,7 +2303,7 @@ static int keyspan_startup(struct usb_serial *serial)
if (d_details == NULL) {
dev_err(&serial->dev->dev, "%s - unknown product id %x\n",
__func__, le16_to_cpu(serial->dev->descriptor.idProduct));
- return 1;
+ return -ENODEV;
}
/* Setup private data for serial driver */