diff options
| author | Daniel Mack <zonque@gmail.com> | 2013-03-04 12:50:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-07 09:24:12 +0100 |
| commit | 2dad9402192250d4061332b6a9be71ebf8493c49 (patch) | |
| tree | d3331b04ee77b962361f20e49a2e491d4ebbddb4 /sound/usb | |
| parent | f1f6b8f65ff08afed4532b88de1a3bbea773787f (diff) | |
| download | linux-2dad9402192250d4061332b6a9be71ebf8493c49.tar.gz linux-2dad9402192250d4061332b6a9be71ebf8493c49.tar.bz2 linux-2dad9402192250d4061332b6a9be71ebf8493c49.zip | |
ALSA: snd-usb-caiaq: fix smatch warnings
Fix three smatch warnings recently introduced:
sound/usb/caiaq/device.c:166 usb_ep1_command_reply_dispatch() warn:
variable dereferenced before check 'cdev' (see line 163)
sound/usb/caiaq/device.c:517 snd_disconnect() warn: variable
dereferenced before check 'card' (see line 514)
sound/usb/caiaq/input.c:510 snd_usb_caiaq_ep4_reply_dispatch() warn:
variable dereferenced before check 'cdev' (see line 506)
Signed-off-by: Daniel Mack <zonque@gmail.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/caiaq/device.c | 8 | ||||
| -rw-r--r-- | sound/usb/caiaq/input.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index d898f737c07e..48b63ccc78c7 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -159,8 +159,8 @@ static struct usb_device_id snd_usb_id_table[] = { static void usb_ep1_command_reply_dispatch (struct urb* urb) { int ret; + struct device *dev = &urb->dev->dev; struct snd_usb_caiaqdev *cdev = urb->context; - struct device *dev = caiaqdev_to_dev(cdev); unsigned char *buf = urb->transfer_buffer; if (urb->status || !cdev) { @@ -511,13 +511,13 @@ static int snd_probe(struct usb_interface *intf, static void snd_disconnect(struct usb_interface *intf) { struct snd_card *card = usb_get_intfdata(intf); - struct snd_usb_caiaqdev *cdev = caiaqdev(card); - struct device *dev; + struct device *dev = intf->usb_dev; + struct snd_usb_caiaqdev *cdev; if (!card) return; - dev = caiaqdev_to_dev(cdev); + cdev = caiaqdev(card); dev_dbg(dev, "%s(%p)\n", __func__, intf); snd_card_disconnect(card); diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c index fe8f4b4fd369..efc70ae915c5 100644 --- a/sound/usb/caiaq/input.c +++ b/sound/usb/caiaq/input.c @@ -503,8 +503,8 @@ static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *cdev, static void snd_usb_caiaq_ep4_reply_dispatch(struct urb *urb) { struct snd_usb_caiaqdev *cdev = urb->context; - struct device *dev = caiaqdev_to_dev(cdev); unsigned char *buf = urb->transfer_buffer; + struct device *dev = &urb->dev->dev; int ret; if (urb->status || !cdev || urb != cdev->ep4_in_urb) |