mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
ALSA: line6: Fix POD sysfs attributes segfault
The commit02fc76f6a
changed base of the sysfs attributes from device to card. The "show" callbacks dereferenced wrong objects because of this. Fixes:02fc76f6a7
('ALSA: line6: Create sysfs via snd_card_add_dev_attr()') Cc: <stable@vger.kernel.org> # v4.0+ Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Andrej Krutak <dev@andree.sk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
adc8a43a6d
commit
b027d11263
1 changed files with 6 additions and 6 deletions
|
@ -244,8 +244,8 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
|
|||
static ssize_t serial_number_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_interface *interface = to_usb_interface(dev);
|
||||
struct usb_line6_pod *pod = usb_get_intfdata(interface);
|
||||
struct snd_card *card = dev_to_snd_card(dev);
|
||||
struct usb_line6_pod *pod = card->private_data;
|
||||
|
||||
return sprintf(buf, "%u\n", pod->serial_number);
|
||||
}
|
||||
|
@ -256,8 +256,8 @@ static ssize_t serial_number_show(struct device *dev,
|
|||
static ssize_t firmware_version_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_interface *interface = to_usb_interface(dev);
|
||||
struct usb_line6_pod *pod = usb_get_intfdata(interface);
|
||||
struct snd_card *card = dev_to_snd_card(dev);
|
||||
struct usb_line6_pod *pod = card->private_data;
|
||||
|
||||
return sprintf(buf, "%d.%02d\n", pod->firmware_version / 100,
|
||||
pod->firmware_version % 100);
|
||||
|
@ -269,8 +269,8 @@ static ssize_t firmware_version_show(struct device *dev,
|
|||
static ssize_t device_id_show(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct usb_interface *interface = to_usb_interface(dev);
|
||||
struct usb_line6_pod *pod = usb_get_intfdata(interface);
|
||||
struct snd_card *card = dev_to_snd_card(dev);
|
||||
struct usb_line6_pod *pod = card->private_data;
|
||||
|
||||
return sprintf(buf, "%d\n", pod->device_id);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue