2 files changed, 10 insertions, 12 deletions

diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 0017e50c6948..9ca889adf120 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -1,5 +1,5 @@
 menuconfig ISDN_DRV_GIGASET
-        tristate "Siemens Gigaset support (isdn)"
+        tristate "Siemens Gigaset support"
         select CRC_CCITT
         select BITREVERSE
         help
@@ -11,11 +11,11 @@ menuconfig ISDN_DRV_GIGASET
           one of the connection specific parts that follow.
           This will build a module called "gigaset".
 
-if ISDN_DRV_GIGASET!=n
+if ISDN_DRV_GIGASET
 
 config GIGASET_BASE
         tristate "Gigaset base station support"
-        depends on ISDN_DRV_GIGASET && USB
+        depends on USB
         help
           Say M here if you want to use the USB interface of the Gigaset
           base for connection to your system.
@@ -23,7 +23,7 @@ config GIGASET_BASE
 
 config GIGASET_M105
         tristate "Gigaset M105 support"
-        depends on ISDN_DRV_GIGASET && USB
+        depends on USB
         help
           Say M here if you want to connect to the Gigaset base via DECT
           using a Gigaset M105 (Sinus 45 Data 2) USB DECT device.
@@ -31,7 +31,6 @@ config GIGASET_M105
 
 config GIGASET_M101
         tristate "Gigaset M101 support"
-        depends on ISDN_DRV_GIGASET
         help
           Say M here if you want to connect to the Gigaset base via DECT
           using a Gigaset M101 (Sinus 45 Data 1) RS232 DECT device.
@@ -48,7 +47,6 @@ config GIGASET_UNDOCREQ
         help
           This enables support for USB requests we only know from
           reverse engineering (currently M105 only). If you need
-          features like configuration mode of M105, say yes. If you
-          care about your device, say no.
+          features like configuration mode of M105, say yes.
 
-endif # ISDN_DRV_GIGASET != n
+endif # ISDN_DRV_GIGASET
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index fba61f670527..d78385166099 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -278,17 +278,17 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
 static int gigaset_set_modem_ctrl(struct cardstate *cs, unsigned old_state,
                                   unsigned new_state)
 {
-        return -EINVAL;
+        return -ENOTTY;
 }
 
 static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
 {
-        return -EINVAL;
+        return -ENOTTY;
 }
 
 static int gigaset_baud_rate(struct cardstate *cs, unsigned cflag)
 {
-        return -EINVAL;
+        return -ENOTTY;
 }
 #endif
 
@@ -577,7 +577,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
         return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
                                0, 0, &buf, 6, 2000);
 #else
-        return -EINVAL;
+        return -ENOTTY;
 #endif
 }