Commit 0e781c22 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Greg Kroah-Hartman
Browse files

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: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f40849b8

drivers/usb/misc/sisusbvga/sisusb.c

+2 −1
Original line number Diff line number Diff line
@@ -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