Merge tag 'v4.4.28' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / sound / usb / proc.c

diff --git a/sound/usb/proc.c b/sound/usb/proc.c
index 5f761ab34c0140b1b62673e46fc59659488b8cc7..0ac89e294d31d50895f57aa20d1805b31adf9572 100644 (file)
--- a/sound/usb/proc.c
+++ b/sound/usb/proc.c
@@ -46,14 +46,14 @@ static inline unsigned get_high_speed_hz(unsigned int usb_rate)
 static void proc_audio_usbbus_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
        struct snd_usb_audio *chip = entry->private_data;
-       if (!chip->shutdown)
+       if (!atomic_read(&chip->shutdown))
                snd_iprintf(buffer, "%03d/%03d\n", chip->dev->bus->busnum, chip->dev->devnum);
 }
 
 static void proc_audio_usbid_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
        struct snd_usb_audio *chip = entry->private_data;
-       if (!chip->shutdown)
+       if (!atomic_read(&chip->shutdown))
                snd_iprintf(buffer, "%04x:%04x\n", 
                            USB_ID_VENDOR(chip->usb_id),
                            USB_ID_PRODUCT(chip->usb_id));