lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 002/151] usb: cdc-wdm: Fix check for WWAN
    Date
    From: Rikard Falkeborn <rikard.falkeborn@gmail.com>

    commit 04d2b75537085cb0c85d73a2e0e50317bffa883f upstream.

    CONFIG_WWAN_CORE was with CONFIG_WWAN in commit 89212e160b81 ("net: wwan:
    Fix WWAN config symbols"), but did not update all users of it. Change it
    back to use CONFIG_WWAN instead.

    Fixes: 89212e160b81 ("net: wwan: Fix WWAN config symbols")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
    Acked-by: Oliver Neukum <oneukum@suse.com>
    Link: https://lore.kernel.org/r/20210929194547.46954-2-rikard.falkeborn@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/class/cdc-wdm.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/usb/class/cdc-wdm.c
    +++ b/drivers/usb/class/cdc-wdm.c
    @@ -824,7 +824,7 @@ static struct usb_class_driver wdm_class
    };

    /* --- WWAN framework integration --- */
    -#ifdef CONFIG_WWAN_CORE
    +#ifdef CONFIG_WWAN
    static int wdm_wwan_port_start(struct wwan_port *port)
    {
    struct wdm_device *desc = wwan_port_get_drvdata(port);
    @@ -963,11 +963,11 @@ static void wdm_wwan_rx(struct wdm_devic
    /* inbuf has been copied, it is safe to check for outstanding data */
    schedule_work(&desc->service_outs_intr);
    }
    -#else /* CONFIG_WWAN_CORE */
    +#else /* CONFIG_WWAN */
    static void wdm_wwan_init(struct wdm_device *desc) {}
    static void wdm_wwan_deinit(struct wdm_device *desc) {}
    static void wdm_wwan_rx(struct wdm_device *desc, int length) {}
    -#endif /* CONFIG_WWAN_CORE */
    +#endif /* CONFIG_WWAN */

    /* --- error handling --- */
    static void wdm_rxwork(struct work_struct *work)

    \
     
     \ /
      Last update: 2021-10-11 16:01    [W:4.655 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site