org.handhelds.familiar/packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- orinoco-0.13e-SN-6/orinoco_cs.c~catch-up-with-cardservices.patch
   7 +++ orinoco-0.13e-SN-6/orinoco_cs.c
   8 @@ -144,16 +144,6 @@
   9  /* PCMCIA stuff                                                    */
  10  /********************************************************************/
  11
  12 -/* In 2.5 (as of 2.5.69 at least) there is a cs_error exported which
  13 - * does this, but it's not in 2.4 so we do our own for now. */
  14 -static void
  15 -orinoco_cs_error(client_handle_t handle, int func, int ret)
  16 -{
  17 -       error_info_t err = { func, ret };
  18 -       pcmcia_report_error(handle, &err);
  19 -}
  20 -
  21 -
  22  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
  23  /* Remove zombie instances (card removed, detach pending) */
  24  static void
  25 @@ -248,7 +238,7 @@
  26
  27         ret = pcmcia_register_client(&link->handle, &client_reg);
  28         if (ret != CS_SUCCESS) {
  29 -               orinoco_cs_error(link->handle, RegisterClient, ret);
  30 +               cs_error(link->handle, RegisterClient, ret);
  31                 orinoco_cs_detach(link);
  32                 return NULL;
  33         }
  34 @@ -538,7 +528,7 @@
  35         return;
  36
  37   cs_failed:
  38 -       orinoco_cs_error(link->handle, last_fn, last_ret);
  39 +       cs_error(link->handle, last_fn, last_ret);
  40
  41   failed:
  42         orinoco_cs_release(link);