From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbcLHLgE (ORCPT ); Thu, 8 Dec 2016 06:36:04 -0500 Received: from mout.web.de ([212.227.17.12]:57329 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbcLHLgC (ORCPT ); Thu, 8 Dec 2016 06:36:02 -0500 Subject: [PATCH 3/5] staging: comedi: usbdux: Move an assignment in usbdux_alloc_usb_buffers() To: devel@driverdev.osuosl.org, Chris Cesare , Greg Kroah-Hartman , H Hartley Sweeten , Ian Abbott References: <8cddc37d-4529-ada4-ac21-20e09e888d0d@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <92a56e39-6472-415c-0fa6-e2786b006f98@users.sourceforge.net> Date: Thu, 8 Dec 2016 12:35:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <8cddc37d-4529-ada4-ac21-20e09e888d0d@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:MQeVj+F8Zj5hJJIopwIDvNyCdtUo7sP6OkUqvEH58l4WU2rsf4B D8F5S0AEHoeUOV3TEQrSJiJRF1P61hc32Vk+W0jeZldr0e1uBHDT9uoRGPTtqx/bQT75/od Q24AMO4UnmzU03io0eQfwquGu/5NEFMF++p/p7PFxrhHhTh24xnpYNhPC7oLnYEdOEJ4Cwe cpEKGNiTCW7ncs8P/7iVw== X-UI-Out-Filterresults: notjunk:1;V01:K0:/knWy6UPpsI=:9eSBKf7VtPdSW3vovUrYHQ a3WPss7kwK5nli0Mq9dIwN6/535U3gqP5YAzrghMzLVtjj6LjXFqgpOI1BY+9InTJXh/yU30v gg9IY1D7ZCo3DH9kQkM1Cs5oF/my6pp7vVEiptWzLrCVfgDgQ9kFmClVpeEsgWnU5jzxGlxdZ 1K1I6mVMGpdLB8xokLVwwtpXmqIlSFub/AQArTMLKNuqMRQRq3V6UQNXsMzJTB40vYrmCn/nY K8Zj1Svsx06VLNtW2NZwOWL7RFahYv5JBnpj4eae3C+1WreIbMONrRIgirvNjwphm4HPuV4gw zeHAvUn7NUcUb7bJSJ9WSUpVfUf7s/x9198EtEij16dRMaFSEgwaKcly3H9oOybz7/6TkxbiQ XnPrnO4XfGYPdBTQ2pqWSYeAbrBQmjJLus1MpG8LiFV5eu9VNTc23T4fSHSQfi75UPiqsX/eJ DevsUfmboIS5VzzyyZV4NjwBGXo6nxb3PvWdqtVtY9y1UMtGl4wwdfGCrVpsv0A4fD+48S2r/ ei8x/QWZqivHjEh7qCQZDIob6I+qkb6wJz28pqs5UYZT9OUV1snxazv0SdUk2aA+k0k/Y4u7T 8OhHppmhM7B4hZdP6vNjqfM1s5wQ8cU/pnx0QyQmc7atLNUlXWDR3QcrdYxwgoBFNBd2K+qD9 xOJMaVopzZjVPVb9d69iQj+xgxRS6tK1Ikm926E3j4zQBwxdPKo/vRhYqaoFLIppblMcwMDrH UOLZ4QwOkaumjEdIYhmvhPoUtXMUJX6v32QlSYgd02Py+yMecy6SCPvskeih/Z8CcLH2ztcgx KUYh/0g Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 8 Dec 2016 10:13:56 +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/usbdux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index d7d683bd669c..7efeac71161b 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c @@ -1446,7 +1446,7 @@ static int usbdux_firmware_upload(struct comedi_device *dev, static int usbdux_alloc_usb_buffers(struct comedi_device *dev) { - struct usb_device *usb = comedi_to_usb_dev(dev); + struct usb_device *usb; struct usbdux_private *devpriv = dev->private; struct urb *urb; int i, x; @@ -1473,6 +1473,7 @@ static int usbdux_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