[PATCH] USB: sisusbvga: fix oops in error path of sisusb_probe

[Oliver Neukum]

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

Signed-off-by: oliver Neukum <oneu...@suse.com>
Reported-by: syzbot+a0cbdbd6d169020c8...@syzkaller.appspotmail.com
Fixes: 7b5cd5fefbe02 ("USB: SisUSB2VGA: Convert printk to dev_* macros")
---
 drivers/usb/misc/sisusbvga/sisusb.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c 
b/drivers/usb/misc/sisusbvga/sisusb.c
index 9560fde621ee..23af255831c6 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3029,6 +3029,14 @@ static int sisusb_probe(struct usb_interface *intf,
 
        mutex_init(&(sisusb->lock));
 
+       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 */
+
        /* Register device */
        retval = usb_register_dev(intf, &usb_sisusb_class);
        if (retval) {
@@ -3039,14 +3047,6 @@ static int sisusb_probe(struct usb_interface *intf,
                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 */
-
        /* Allocate buffers */
        sisusb->ibufsize = SISUSB_IBUF_SIZE;
        sisusb->ibuf = kmalloc(SISUSB_IBUF_SIZE, GFP_KERNEL);
-- 
2.16.4