aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2010-05-22 21:02:38 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-24 02:57:44 -0400
commite487639dc8ca6bd6c19a4140f45ebc88da56ddd5 (patch)
tree8e53655324747a24adbe586f2cd71c05baef73b8 /drivers/isdn
parent85a83560afa69862639fb2d6f670b4440a003335 (diff)
isdn/gigaset: remove dummy CAPI method implementations
Dummy implementations for the optional CAPI controller operations load_firmware and reset_ctr can cause userspace callers to hang indefinitely. It's better not to implement them at all. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Acked-by: Karsten Keil <isdn@linux-pingi.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/gigaset/capi.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 964a55fb1486..e72f86bccaa5 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -933,30 +933,6 @@ void gigaset_isdn_stop(struct cardstate *cs)
933 */ 933 */
934 934
935/* 935/*
936 * load firmware
937 */
938static int gigaset_load_firmware(struct capi_ctr *ctr, capiloaddata *data)
939{
940 struct cardstate *cs = ctr->driverdata;
941
942 /* AVM specific operation, not needed for Gigaset -- ignore */
943 dev_notice(cs->dev, "load_firmware ignored\n");
944
945 return 0;
946}
947
948/*
949 * reset (deactivate) controller
950 */
951static void gigaset_reset_ctr(struct capi_ctr *ctr)
952{
953 struct cardstate *cs = ctr->driverdata;
954
955 /* AVM specific operation, not needed for Gigaset -- ignore */
956 dev_notice(cs->dev, "reset_ctr ignored\n");
957}
958
959/*
960 * register CAPI application 936 * register CAPI application
961 */ 937 */
962static void gigaset_register_appl(struct capi_ctr *ctr, u16 appl, 938static void gigaset_register_appl(struct capi_ctr *ctr, u16 appl,
@@ -2213,8 +2189,8 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
2213 iif->ctr.driverdata = cs; 2189 iif->ctr.driverdata = cs;
2214 strncpy(iif->ctr.name, isdnid, sizeof(iif->ctr.name)); 2190 strncpy(iif->ctr.name, isdnid, sizeof(iif->ctr.name));
2215 iif->ctr.driver_name = "gigaset"; 2191 iif->ctr.driver_name = "gigaset";
2216 iif->ctr.load_firmware = gigaset_load_firmware; 2192 iif->ctr.load_firmware = NULL;
2217 iif->ctr.reset_ctr = gigaset_reset_ctr; 2193 iif->ctr.reset_ctr = NULL;
2218 iif->ctr.register_appl = gigaset_register_appl; 2194 iif->ctr.register_appl = gigaset_register_appl;
2219 iif->ctr.release_appl = gigaset_release_appl; 2195 iif->ctr.release_appl = gigaset_release_appl;
2220 iif->ctr.send_message = gigaset_send_message; 2196 iif->ctr.send_message = gigaset_send_message;