Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: snd-usb-caiaq: fix smatch warnings

Browse Source 
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>
This commit is contained in:
Daniel Mack 2013-03-04 12:50:05 +01:00 committed by Takashi Iwai
parent f1f6b8f65f
commit 2dad940219
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/usb/caiaq/device.c
View File

@ -159,8 +159,8 @@ static struct usb_device_id snd_usb_id_table[] = {
static void usb_ep1_command_reply_dispatch (struct urb* urb) static void usb_ep1_command_reply_dispatch (struct urb* urb)
{ {
int ret; int ret;
struct device *dev = &urb->dev->dev;
struct snd_usb_caiaqdev *cdev = urb->context; struct snd_usb_caiaqdev *cdev = urb->context;
struct device *dev = caiaqdev_to_dev(cdev);
unsigned char *buf = urb->transfer_buffer; unsigned char *buf = urb->transfer_buffer;
if (urb->status || !cdev) { if (urb->status || !cdev) {
@ -511,13 +511,13 @@ static int snd_probe(struct usb_interface *intf,
static void snd_disconnect(struct usb_interface *intf) static void snd_disconnect(struct usb_interface *intf)
{ {
struct snd_card *card = usb_get_intfdata(intf); struct snd_card *card = usb_get_intfdata(intf);
struct snd_usb_caiaqdev *cdev = caiaqdev(card); struct device *dev = intf->usb_dev;
struct device *dev; struct snd_usb_caiaqdev *cdev;
if (!card) if (!card)
return; return;
dev = caiaqdev_to_dev(cdev); cdev = caiaqdev(card);
dev_dbg(dev, "%s(%p)\n", __func__, intf); dev_dbg(dev, "%s(%p)\n", __func__, intf);
snd_card_disconnect(card); snd_card_disconnect(card);

2
sound/usb/caiaq/input.c
View File

@ -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) static void snd_usb_caiaq_ep4_reply_dispatch(struct urb *urb)
{ {
struct snd_usb_caiaqdev *cdev = urb->context; struct snd_usb_caiaqdev *cdev = urb->context;
struct device *dev = caiaqdev_to_dev(cdev);
unsigned char *buf = urb->transfer_buffer; unsigned char *buf = urb->transfer_buffer;
struct device *dev = &urb->dev->dev;
int ret; int ret;
if (urb->status || !cdev || urb != cdev->ep4_in_urb) if (urb->status || !cdev || urb != cdev->ep4_in_urb)