[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e3bc68d0-b2ed-2070-18fb-1afe854f672d@users.sourceforge.net>
Date: Thu, 8 Dec 2016 12:38:21 +0100
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: devel@...verdev.osuosl.org, Chris Cesare <chris.cesare@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
H Hartley Sweeten <hsweeten@...ionengravers.com>,
Ian Abbott <abbotti@....co.uk>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org
Subject: [PATCH 5/5] staging: comedi: usbduxsigma: Move an assignment in
usbduxsigma_alloc_usb_buffers()
From: Markus Elfring <elfring@...rs.sourceforge.net>
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 <elfring@...rs.sourceforge.net>
---
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
Powered by blists - more mailing lists