[PATCH 3.16 121/132] USB: sisusbvga: fix oops in error path of sisusb_probe

[Ben Hutchings]

3.16.74-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Oliver Neukum <oneu...@suse.com>

commit 9a5729f68d3a82786aea110b1bfe610be318f80a upstream.

The pointer used to log a failure of usb_register_dev() must
be set before the error is logged.

v2: fix that minor is not available before registration

Signed-off-by: oliver Neukum <oneu...@suse.com>
Reported-by: syzbot+a0cbdbd6d169020c8...@syzkaller.appspotmail.com
Fixes: 7b5cd5fefbe02 ("USB: SisUSB2VGA: Convert printk to dev_* macros")
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/usb/misc/sisusbvga/sisusb.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3093,6 +3093,13 @@ static int sisusb_probe(struct usb_inter
 
        mutex_init(&(sisusb->lock));
 
+       sisusb->sisusb_dev = dev;
+       sisusb->vrambase   = SISUSB_PCI_MEMBASE;
+       sisusb->mmiobase   = SISUSB_PCI_MMIOBASE;
+       sisusb->mmiosize   = SISUSB_PCI_MMIOSIZE;
+       sisusb->ioportbase = SISUSB_PCI_IOPORTBASE;
+       /* Everything else is zero */
+
        /* Register device */
        if ((retval = usb_register_dev(intf, &usb_sisusb_class))) {
                dev_err(&sisusb->sisusb_dev->dev, "Failed to get a minor for 
device %d\n",
@@ -3101,13 +3108,7 @@ static int sisusb_probe(struct usb_inter
                goto error_1;
        }
 
-       sisusb->sisusb_dev = dev;
-       sisusb->minor      = intf->minor;
-       sisusb->vrambase   = SISUSB_PCI_MEMBASE;
-       sisusb->mmiobase   = SISUSB_PCI_MMIOBASE;
-       sisusb->mmiosize   = SISUSB_PCI_MMIOSIZE;
-       sisusb->ioportbase = SISUSB_PCI_IOPORTBASE;
-       /* Everything else is zero */
+       sisusb->minor = intf->minor;
 
        /* Allocate buffers */
        sisusb->ibufsize = SISUSB_IBUF_SIZE;