summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/cw1200/bh.c4
-rw-r--r--drivers/staging/cw1200/cw1200_sdio.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/cw1200/bh.c b/drivers/staging/cw1200/bh.c
index 4c4a3bf86ad..231213a9cda 100644
--- a/drivers/staging/cw1200/bh.c
+++ b/drivers/staging/cw1200/bh.c
@@ -206,10 +206,6 @@ static int cw1200_bh_read_ctrl_reg(struct cw1200_common *priv,
if (ret)
printk(KERN_ERR
"[BH] Failed to read control register.\n");
- else
- printk(KERN_WARNING
- "[BH] Second attempt to read control "
- "register passed. This is a firmware bug.\n");
}
return ret;
diff --git a/drivers/staging/cw1200/cw1200_sdio.c b/drivers/staging/cw1200/cw1200_sdio.c
index 279dff144ae..1257e68648a 100644
--- a/drivers/staging/cw1200/cw1200_sdio.c
+++ b/drivers/staging/cw1200/cw1200_sdio.c
@@ -50,13 +50,7 @@ static int cw1200_sdio_memcpy_fromio(struct sbus_priv *self,
unsigned int addr,
void *dst, int count)
{
- int ret = sdio_memcpy_fromio(self->func, dst, addr, count);
- if (ret) {
- printk(KERN_ERR "!!! Can't read %d bytes from 0x%.8X."
- " Err %d.\n",
- count, addr, ret);
- }
- return ret;
+ return sdio_memcpy_fromio(self->func, dst, addr, count);
}
static int cw1200_sdio_memcpy_toio(struct sbus_priv *self,