]> git.baikalelectronics.ru Git - kernel.git/commitdiff
usb: musb: ux500: Add check for NULL board data
authorLee Jones <lee.jones@linaro.org>
Wed, 21 Aug 2013 11:47:03 +0000 (12:47 +0100)
committerFelipe Balbi <balbi@ti.com>
Tue, 27 Aug 2013 20:05:39 +0000 (15:05 -0500)
Dan Carpenter's automatic Smatch checker found an anomaly in the ux500
MUSB driver, whereby board data was checked before use in all but one
occasion. It is believed that it needs to be checked every time.

Smatch complaint:
  drivers/usb/musb/ux500_dma.c:335 ux500_dma_controller_start()
         error: we previously assumed 'data' could be null (see line 313)

Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/ux500_dma.c

index e51dd9b88e7102b9c54fc53317fe32e2b47be103..3700e97132584bc96bb51e29505db12406bc11e3 100644 (file)
@@ -333,7 +333,9 @@ static int ux500_dma_controller_start(struct ux500_dma_controller *controller)
                        if (!ux500_channel->dma_chan)
                                ux500_channel->dma_chan =
                                        dma_request_channel(mask,
-                                                           data->dma_filter,
+                                                           data ?
+                                                           data->dma_filter :
+                                                           NULL,
                                                            param_array[ch_num]);
 
                        if (!ux500_channel->dma_chan) {