From patchwork Thu Aug 18 21:52:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Krutak X-Patchwork-Id: 9288661 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91C55607FF for ; Thu, 18 Aug 2016 21:54:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8050029155 for ; Thu, 18 Aug 2016 21:54:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7475729177; Thu, 18 Aug 2016 21:54:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C83829155 for ; Thu, 18 Aug 2016 21:54:37 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 38190266C2B; Thu, 18 Aug 2016 23:54:37 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 776162665C1; Thu, 18 Aug 2016 23:53:09 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4482E2665C1; Thu, 18 Aug 2016 23:53:08 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by alsa0.perex.cz (Postfix) with ESMTP id 091EA26645B for ; Thu, 18 Aug 2016 23:52:52 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id q128so1220925wma.1 for ; Thu, 18 Aug 2016 14:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TwMp5VWiDq0FtvzEi1k67gS2Y9izqMq1YoOT1NXuMCc=; b=zGAfVcdK9h+0Sd1NDxsVaTUdo9VFFGlIsDjvXSZ7yTUU8QX0tLnCEUR2qxyMr5qngu yjUQ1L7sP6UAZrqZyH23LUmS715Q+G5U/ZZ2xhJqN7lD3+zqwDcSVmsdbet9vRn+qrZu l2hSkjPorMFZcIKAsHnwCO+xuYXypOD8p3BKEH5kTcLP9lqInakKKNnVtNWnVlPW0y2w F/5JOHF1WuPIsPSuF1VaL+8LwYcjngJemw0VTP3zIOoFwcv79DNS9rY3wOoPlwqTmYeI 9jIVnw5/YKNf1vh0FSLK6Igo5LreLtbEbKy4s4AXIm/5IAQyYazvLO6x84TLT1ljkHyA TfEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=TwMp5VWiDq0FtvzEi1k67gS2Y9izqMq1YoOT1NXuMCc=; b=EYTIJ2Hnj2cixNxzdZ390HIwaU3BwRBswo1n6oVRs3RLgY0/VYukgFNVpv7QveUn4J Byr+UbvhJT7jrb8Jo0CO1Kb94X+YHLlbPhbUgcotkw2Ifs+RxDkLzaW5k7WioVII54bn rjm+1LWW8fG0Q8e8CE+a7qHA563Q3jWJ2vkuVLsfER+gh8UoND7+sIWz45eSPZlkDhAQ HbSDHcy4ntp7iOZd+fDMPvbFMv4bHIfwVWE5TDIHvv2JnGLELpjr/SOBw2tb6OaBb1sR qwTIpXI24fKr/BWyfwVm+2Am5Hb1iYF+13jpkIrAeV9yFjXeWbjOqN2TWalHwr3s/8PE 3kaQ== X-Gm-Message-State: AEkoouuxipUcpqjBDj/Bo6hK8cME3DojVxcvo0UASljdtiAEvYVPpyjKFmbTC6TQAmO3/w== X-Received: by 10.194.135.179 with SMTP id pt19mr2504738wjb.157.1471557171750; Thu, 18 Aug 2016 14:52:51 -0700 (PDT) Received: from andree.lan ([217.30.74.231]) by smtp.gmail.com with ESMTPSA id r127sm1377230wmf.23.2016.08.18.14.52.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Aug 2016 14:52:50 -0700 (PDT) From: Andrej Krutak To: tiwai@suse.com, perex@perex.cz, stefanha@gmail.com, grabner@icg.tugraz.at, alsa-devel@alsa-project.org Date: Thu, 18 Aug 2016 23:52:12 +0200 Message-Id: <1471557132-10206-4-git-send-email-dev@andree.sk> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471557132-10206-1-git-send-email-dev@andree.sk> References: <1471557132-10206-1-git-send-email-dev@andree.sk> Cc: Andrej Krutak Subject: [alsa-devel] [PATCH 3/3] ALSA: line6: Fix POD sysfs attributes segfault X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The commit 02fc76f6a changed base of the sysfs attributes from device to card. The "show" callbacks dereferenced wrong objects because of this. Reviewed-by: Stefan Hajnoczi --- sound/usb/line6/pod.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index daf81d1..45dd348 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -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); }