diff --git a/[refs] b/[refs] index 9a28bd1edd65..3f654e386396 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e91a73568b19b4a8145fc6e05314d522ee35a0b1 +refs/heads/master: 50accc9c428273501dd2a6295c84a533dd1fe645 diff --git a/trunk/net/atm/common.c b/trunk/net/atm/common.c index 83454e12317d..db9318fc6031 100644 --- a/trunk/net/atm/common.c +++ b/trunk/net/atm/common.c @@ -424,7 +424,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci) vcc->qos.rxtp.traffic_class == ATM_ANYCLASS) return -EINVAL; if (likely(itf != ATM_ITF_ANY)) { - dev = atm_dev_lookup(itf); + dev = try_then_request_module(atm_dev_lookup(itf), "atm-device-%d", itf); } else { dev = NULL; spin_lock(&atm_dev_lock); diff --git a/trunk/net/atm/resources.c b/trunk/net/atm/resources.c index 415d2615d475..35f3ceb76868 100644 --- a/trunk/net/atm/resources.c +++ b/trunk/net/atm/resources.c @@ -245,7 +245,8 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg) if (get_user(number, &sioc->number)) return -EFAULT; - if (!(dev = atm_dev_lookup(number))) + if (!(dev = try_then_request_module(atm_dev_lookup(number), + "atm-device-%d", number))) return -ENODEV; switch (cmd) {