From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Thu, 08 Dec 2016 11:38:21 +0000 Subject: [PATCH 5/5] staging: comedi: usbduxsigma: Move an assignment in usbduxsigma_alloc_usb_buffers() Message-Id: List-Id: References: <8cddc37d-4529-ada4-ac21-20e09e888d0d@users.sourceforge.net> In-Reply-To: <8cddc37d-4529-ada4-ac21-20e09e888d0d@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: devel@driverdev.osuosl.org, Chris Cesare , Greg Kroah-Hartman , H Hartley Sweeten , Ian Abbott Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Thu, 8 Dec 2016 11:20:38 +0100 Move one assignment for the local variable "usb" so that its setting will only be performed after some memory allocations succeeded by this function. Signed-off-by: Markus Elfring --- drivers/staging/comedi/drivers/usbduxsigma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index 8c04aa5339f3..7c1f9198447a 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1338,7 +1338,7 @@ static int usbduxsigma_firmware_upload(struct comedi_device *dev, static int usbduxsigma_alloc_usb_buffers(struct comedi_device *dev) { - struct usb_device *usb = comedi_to_usb_dev(dev); + struct usb_device *usb; struct usbduxsigma_private *devpriv = dev->private; struct urb *urb; int i, x; @@ -1367,6 +1367,7 @@ static int usbduxsigma_alloc_usb_buffers(struct comedi_device *dev) if (!devpriv->ao_urbs) goto free_ai_urbs; + usb = comedi_to_usb_dev(dev); for (i = 0; i < devpriv->n_ai_urbs; i++) { /* one frame: 1ms */ urb = usb_alloc_urb(1, GFP_KERNEL); -- 2.11.0