diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch | |
parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch')
-rw-r--r-- | packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch b/packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch index e69de29bb2..cc369bdd8f 100644 --- a/packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch +++ b/packages/orinoco/orinoco-modules-0.13e/use-cs-error.patch @@ -0,0 +1,42 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- orinoco-0.13e-SN-6/orinoco_cs.c~catch-up-with-cardservices.patch ++++ orinoco-0.13e-SN-6/orinoco_cs.c +@@ -144,16 +144,6 @@ + /* PCMCIA stuff */ + /********************************************************************/ + +-/* In 2.5 (as of 2.5.69 at least) there is a cs_error exported which +- * does this, but it's not in 2.4 so we do our own for now. */ +-static void +-orinoco_cs_error(client_handle_t handle, int func, int ret) +-{ +- error_info_t err = { func, ret }; +- pcmcia_report_error(handle, &err); +-} +- +- + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + /* Remove zombie instances (card removed, detach pending) */ + static void +@@ -248,7 +238,7 @@ + + ret = pcmcia_register_client(&link->handle, &client_reg); + if (ret != CS_SUCCESS) { +- orinoco_cs_error(link->handle, RegisterClient, ret); ++ cs_error(link->handle, RegisterClient, ret); + orinoco_cs_detach(link); + return NULL; + } +@@ -538,7 +528,7 @@ + return; + + cs_failed: +- orinoco_cs_error(link->handle, last_fn, last_ret); ++ cs_error(link->handle, last_fn, last_ret); + + failed: + orinoco_cs_release(link); |