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>

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index b3713d57ce019e546c37114c73a902bbee3fcc80..a22de52cb083da11402e9393bfadfe65eb68f2b8 100644 (file)
--- 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