diff options
| author | Dylan Reid <dgreid@chromium.org> | 2017-01-04 15:45:17 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-01-05 18:39:53 -0800 |
| commit | af9251677991442047246e5782e83210cd4fde1b (patch) | |
| tree | 5a700790fc85a963c9d1dfeb9c7630d680291747 | |
| parent | 1c80a342901eea138b09961cf25629c8aa69958b (diff) | |
| download | adhd-af9251677991442047246e5782e83210cd4fde1b.tar.gz | |
cras_udev - Don't reuse dev variable
For readability, don't reassign the dev pointer with the parent dev
pointer. Give the parent dev pointer its own name.
Change-Id: Ieb1e636f0f38ff7b3cba3705f2cc053b607d8075
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/424843
Reviewed-by: Hsinyu Chao <hychao@chromium.org>
Reviewed-by: Chinyue Chen <chinyue@chromium.org>
| -rw-r--r-- | cras/src/server/cras_udev.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cras/src/server/cras_udev.c b/cras/src/server/cras_udev.c index 02ff766b..7bcad46a 100644 --- a/cras/src/server/cras_udev.c +++ b/cras/src/server/cras_udev.c @@ -252,19 +252,20 @@ static void fill_usb_card_info(struct cras_alsa_card_info *card_info, struct udev_device *dev) { const char *sysattr; - dev = udev_device_get_parent_with_subsystem_devtype(dev, - "usb", - "usb_device"); - if (!dev) + struct udev_device *parent_dev = + udev_device_get_parent_with_subsystem_devtype(dev, + "usb", + "usb_device"); + if (!parent_dev) return; - sysattr = udev_device_get_sysattr_value(dev, "idVendor"); + sysattr = udev_device_get_sysattr_value(parent_dev, "idVendor"); if (sysattr) card_info->usb_vendor_id = strtol(sysattr, NULL, 16); - sysattr = udev_device_get_sysattr_value(dev, "idProduct"); + sysattr = udev_device_get_sysattr_value(parent_dev, "idProduct"); if (sysattr) card_info->usb_product_id = strtol(sysattr, NULL, 16); - sysattr = udev_device_get_sysattr_value(dev, "serial"); + sysattr = udev_device_get_sysattr_value(parent_dev, "serial"); if (sysattr) { strncpy(card_info->usb_serial_number, sysattr, USB_SERIAL_NUMBER_BUFFER_SIZE - 1); @@ -272,7 +273,7 @@ static void fill_usb_card_info(struct cras_alsa_card_info *card_info, = '\0'; } - card_info->usb_desc_checksum = calculate_desc_checksum(dev); + card_info->usb_desc_checksum = calculate_desc_checksum(parent_dev); syslog(LOG_ERR, "USB card: vendor:%04x, product:%04x, serial num:%s, " "checksum:%08x", |