Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228133
b: refs/heads/master
c: 63fcf10
h: refs/heads/master
i:
  228131: 6648035
v: v3
  • Loading branch information
Yong Wang authored and Greg Kroah-Hartman committed Nov 17, 2010
1 parent 15d73fb commit 32bf78f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6f5a416216fe2c39171326897e074d417df1082b
refs/heads/master: 63fcf10db218a89cbd1e34c47540c3e28706cff1
13 changes: 9 additions & 4 deletions trunk/drivers/staging/spectra/ffsport.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <linux/log2.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/async.h>

/**** Helper functions used for Div, Remainder operation on u64 ****/

Expand Down Expand Up @@ -729,7 +730,7 @@ static void create_sysfs_entry(struct device *dev)
}
*/

int register_spectra_ftl()
static void register_spectra_ftl_async(void *unused, async_cookie_t cookie)
{
int i;

Expand All @@ -738,7 +739,7 @@ int register_spectra_ftl()
if (PASS != GLOB_FTL_IdentifyDevice(&IdentifyDeviceData)) {
printk(KERN_ERR "Spectra: Unable to Read Flash Device. "
"Aborting\n");
return -ENOMEM;
return;
} else {
nand_dbg_print(NAND_DBG_WARN, "In GLOB_SBD_init: "
"Num blocks=%d, pagesperblock=%d, "
Expand Down Expand Up @@ -772,15 +773,19 @@ int register_spectra_ftl()
"Spectra: module loaded with major number %d\n",
GLOB_SBD_majornum);

return PASS;
return;

out_blk_register:
unregister_blkdev(GLOB_SBD_majornum, GLOB_SBD_NAME);
out_ftl_flash_register:
GLOB_FTL_Cache_Release();
printk(KERN_ERR "Spectra: Module load failed.\n");
}

return FAIL;
int register_spectra_ftl()
{
async_schedule(register_spectra_ftl_async, NULL);
return 0;
}
EXPORT_SYMBOL_GPL(register_spectra_ftl);

Expand Down

0 comments on commit 32bf78f

Please sign in to comment.