Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205714
b: refs/heads/master
c: 600cec3
h: refs/heads/master
v: v3
  • Loading branch information
Matti Lammi authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent 76b9b16 commit a3b9813
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 37523e84cbf1d82fcc8237ed10818d37b951144e
refs/heads/master: 600cec3ed0a08f62712c6d3c5fea2fcb8b7e3675
9 changes: 5 additions & 4 deletions trunk/drivers/staging/memrar/memrar_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ static int memrar_init_rar_resources(int rarnum, char const *devname)
if (rar_get_address(rarnum, &low, &high) != 0)
/* No RAR is available. */
return -ENODEV;

if (low == 0 || high == 0) {
rar->base = 0;
rar->length = 0;
Expand All @@ -311,7 +311,8 @@ static int memrar_init_rar_resources(int rarnum, char const *devname)
/* Claim RAR memory as our own. */
if (request_mem_region(low, rar->length, devname) == NULL) {
rar->length = 0;
pr_err("%s: Unable to claim RAR[%d] memory.\n", devname, rarnum);
pr_err("%s: Unable to claim RAR[%d] memory.\n",
devname, rarnum);
pr_err("%s: RAR[%d] disabled.\n", devname, rarnum);
return -EBUSY;
}
Expand Down Expand Up @@ -347,7 +348,7 @@ static int memrar_init_rar_resources(int rarnum, char const *devname)
}

pr_info("%s: BRAR[%d] bus address range = [0x%lx, 0x%lx]\n",
devname, rarnum, (unsigned long) low, (unsigned long) high);
devname, rarnum, (unsigned long) low, (unsigned long) high);

pr_info("%s: BRAR[%d] size = %zu KiB\n",
devname, rarnum, rar->allocator->capacity / 1024);
Expand Down Expand Up @@ -531,7 +532,7 @@ static long memrar_get_stat(struct RAR_stat *r)
{
struct memrar_allocator *allocator;

if (!memrar_is_valid_rar_type(r->type))
if (!memrar_is_valid_rar_type(r->type))
return -EINVAL;

if (!memrars[r->type].allocated)
Expand Down

0 comments on commit a3b9813

Please sign in to comment.