a3bff1b94041c6778a71655edd9c196bded7bb15
[openwrt.git] / package / ar7-atm / patches-D7.05.01.00 / 200-2.6.37_args.patch
1 --- a/tn7atm.c
2 +++ b/tn7atm.c
3 @@ -2000,7 +2000,11 @@ static int __init tn7atm_register (Tn7At
4  
5    dgprintf (4, "device %s being registered\n", priv->name);
6  
7 +  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
8    mydev = atm_dev_register (priv->proc_name, &tn7atm_ops, -1, NULL);
9 +  #else
10 +  mydev = atm_dev_register (priv->proc_name, NULL, &tn7atm_ops, -1, NULL);
11 +  #endif
12  
13    if (mydev == NULL)
14    {
15 --- a/tn7dsl.c
16 +++ b/tn7dsl.c
17 @@ -512,14 +512,17 @@ int shim_osLoadFWImage(unsigned char *pt
18  {
19         const struct firmware *fw_entry;
20         size_t size;
21 +       int ret;
22  
23  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
24         dev_set_name(&avsar, "avsar");
25  #endif
26         printk("requesting firmware image \"ar0700xx.bin\"\n");
27 -       if(device_register(&avsar) < 0) {
28 +       dev_set_name(&avsar, "avsar");
29 +       ret = device_register(&avsar);
30 +       if (ret < 0) {
31                 printk(KERN_ERR
32 -                       "avsar: device_register fails\n");
33 +                       "avsar: device_register fails, error%i\n", ret);
34                 return -1;
35         }
36