From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932171AbcLHLij (ORCPT ); Thu, 8 Dec 2016 06:38:39 -0500 Received: from mout.web.de ([212.227.17.11]:61847 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752208AbcLHLih (ORCPT ); Thu, 8 Dec 2016 06:38:37 -0500 Subject: [PATCH 5/5] staging: comedi: usbduxsigma: Move an assignment in usbduxsigma_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: Date: Thu, 8 Dec 2016 12:38:21 +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:99Mndo3yClTuZ9InYG6T3N99M2I4GnWYy1z19ofKo8INLqh4JnO HhaDpjBulNK5Vz5wp38I08flTvhUP9webl3EnUHpKD5VFZxr02uVkX9+KQVv1DZfIBW83i8 R0IcihshgAO+wXfQwXWcqJB/ZH/3W+IwfN4BtVoTbfzyPDtUFJ9dhy2ASOT7wSL91yjyCbx HYPlous+3Kfy56Q8gFL9g== X-UI-Out-Filterresults: notjunk:1;V01:K0:KxcoREjU8qU=:PLGvEbdacQ59/eDFVrFWlJ 7aSfvv5JJkDpjyLOSb9Gluh3vzTnSOGSQMN74PqoExdafzCG3PiA9K0D7Q5LEN2ibCIMtB2iS NXdHFYAEfAqIZkJKmP9VkROsi7HcJI+PTTVWHA4m+D7IZHyDlYDKD0ipzc8J+hTpfauZuc9bB cGT5GQ/7qNMBB1GFA3tF1UI1U/ov1v4EkdPSJsyAdf0CUwCoEcKhe4Hk//gzYeHJD0h1+xeVl V0Mq/10V6149qN4GbLf6oD4q/INJaYWV9f2WmtIZD0PeIPL+cBlRM9nAdCckktBwfkeZn7231 Bv/RkzGLsQvClA1f4LP/lDTpdGpmS9Lys05cG9yXE9d9ezmSt8ZTuM56PxnFks6pvVCMo0A0s eRoImNCEplIhuQ/IIa8F1uygiasH1VuGnPZaCO10r2AXDuiBJcQkzp4Mciku7PhTR+uqUkrF4 Y644RIda2fLcbHC7Yvw7lsbzFqOfDa+ySKYfOOyJXDRtBsU5qJNkrd5cK1QAQt48fgqGNcNsl gW7a2jd+cWmOkbS+bWpSsVlB5fGaFU9pm8mbQ9XRwA+Pyj74Vi5vjD3Kocs+tukYJw8kXKVQY 3YRAB7hyUTudQHkoLM4r3tOoSTkOxv3e3t7TKcHcMZ7UdpJsI2HkVV3Cmwy153ic1kU3OFqIq 4iGN/8xNOLmUGY/GAcMTtnGW3kii4nl+ATQJGb30gwcewwMz+OkFErHTCrx0B4LLbrPGQtYx9 VF6NpD/A4sRNxvsqcVatF2Ck/DUKKfOuqGDcVXZjVZbnTJn2kXhnvj1kEng4cYIVAzG4y5Fz6 gH4EHez 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 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