diff options
| author |   Peter Senna Tschudin <peter.senna@collabora.com> | 2016-01-15 18:41:34 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-24 21:04:54 -0800 |
| commit | 0e781c2258ffb2a42bf44f62dea8662f38cbfd34 (patch) | |
| tree | 67f6088cdbe27219683d4dcb04d7383f78e7e112 /drivers/usb/misc/sisusbvga/sisusb.c | |
| parent | usb-misc: sisusbvga: Remove memory allocation logs (diff) | |
| download | linux-dev-0e781c2258ffb2a42bf44f62dea8662f38cbfd34.tar.xz linux-dev-0e781c2258ffb2a42bf44f62dea8662f38cbfd34.zip | |
usb-misc: sisusbvga: fix error path
Remove a call to dev_err() that was reporting an unsuccesful call to
kmalloc(), as reporting memory allocation failures is redundant. Instead
of logging the error, clean up previously allocated resources and abort
the probe with -ENOMEM. Before this change sisusb->SiS_Pr could be
dereferenced even if null after failure of memory allocation.
Signed-off-by: Peter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc/sisusbvga/sisusb.c')
| -rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index b3713d57ce01..a22de52cb083 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c @@ -3112,7 +3112,8 @@ static int sisusb_probe(struct usb_interface *intf, /* Allocate our SiS_Pr */ sisusb->SiS_Pr = kmalloc(sizeof(struct SiS_Private), GFP_KERNEL); if (!sisusb->SiS_Pr) { - dev_err(&sisusb->sisusb_dev->dev, "Failed to allocate SiS_Pr\n"); + retval = -ENOMEM; + goto error_4; } #endif |