summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/gadget/function/f_diag.c3
-rw-r--r--include/linux/usb/usbdiag.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/f_diag.c b/drivers/usb/gadget/function/f_diag.c
index 4210f77a6245..c884ae19be1e 100644
--- a/drivers/usb/gadget/function/f_diag.c
+++ b/drivers/usb/gadget/function/f_diag.c
@@ -1090,3 +1090,6 @@ static void __exit diag_exit(void)
module_init(diag_init);
module_exit(diag_exit);
+
+MODULE_DESCRIPTION("Diag function driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/usb/usbdiag.h b/include/linux/usb/usbdiag.h
index 1e9fa761579a..f66762800368 100644
--- a/include/linux/usb/usbdiag.h
+++ b/include/linux/usb/usbdiag.h
@@ -49,7 +49,7 @@ struct usb_diag_ch {
void *priv_usb;
};
-#ifdef CONFIG_USB_F_DIAG
+#if IS_ENABLED(CONFIG_USB_F_DIAG)
int usb_diag_request_size(struct usb_diag_ch *ch);
struct usb_diag_ch *usb_diag_open(const char *name, void *priv,
void (*notify)(void *, unsigned, struct diag_request *));
@@ -81,5 +81,5 @@ int usb_diag_write(struct usb_diag_ch *ch, struct diag_request *d_req)
{
return -ENODEV;
}
-#endif /* CONFIG_USB_G_ANDROID */
+#endif /* CONFIG_USB_F_DIAG */
#endif /* _DRIVERS_USB_DIAG_H_ */