aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/mmc.c4
-rw-r--r--drivers/mmc/core/sd.c14
2 files changed, 8 insertions, 10 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index f606b6678b0..21d7f48e1d4 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -100,7 +100,7 @@ static int mmc_decode_cid(struct mmc_card *card)
100 break; 100 break;
101 101
102 default: 102 default:
103 printk("%s: card has unknown MMCA version %d\n", 103 printk(KERN_ERR "%s: card has unknown MMCA version %d\n",
104 mmc_hostname(card->host), card->csd.mmca_vsn); 104 mmc_hostname(card->host), card->csd.mmca_vsn);
105 return -EINVAL; 105 return -EINVAL;
106 } 106 }
@@ -123,7 +123,7 @@ static int mmc_decode_csd(struct mmc_card *card)
123 */ 123 */
124 csd_struct = UNSTUFF_BITS(resp, 126, 2); 124 csd_struct = UNSTUFF_BITS(resp, 126, 2);
125 if (csd_struct != 1 && csd_struct != 2) { 125 if (csd_struct != 1 && csd_struct != 2) {
126 printk("%s: unrecognised CSD structure version %d\n", 126 printk(KERN_ERR "%s: unrecognised CSD structure version %d\n",
127 mmc_hostname(card->host), csd_struct); 127 mmc_hostname(card->host), csd_struct);
128 return -EINVAL; 128 return -EINVAL;
129 } 129 }
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index b6a2e53c921..1edc62b1e5c 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -149,7 +149,7 @@ static int mmc_decode_csd(struct mmc_card *card)
149 csd->write_partial = 0; 149 csd->write_partial = 0;
150 break; 150 break;
151 default: 151 default:
152 printk("%s: unrecognised CSD structure version %d\n", 152 printk(KERN_ERR "%s: unrecognised CSD structure version %d\n",
153 mmc_hostname(card->host), csd_struct); 153 mmc_hostname(card->host), csd_struct);
154 return -EINVAL; 154 return -EINVAL;
155 } 155 }
@@ -173,7 +173,7 @@ static int mmc_decode_scr(struct mmc_card *card)
173 173
174 scr_struct = UNSTUFF_BITS(resp, 60, 4); 174 scr_struct = UNSTUFF_BITS(resp, 60, 4);
175 if (scr_struct != 0) { 175 if (scr_struct != 0) {
176 printk("%s: unrecognised SCR structure version %d\n", 176 printk(KERN_ERR "%s: unrecognised SCR structure version %d\n",
177 mmc_hostname(card->host), scr_struct); 177 mmc_hostname(card->host), scr_struct);
178 return -EINVAL; 178 return -EINVAL;
179 } 179 }
@@ -206,9 +206,8 @@ static int mmc_read_switch(struct mmc_card *card)
206 206
207 status = kmalloc(64, GFP_KERNEL); 207 status = kmalloc(64, GFP_KERNEL);
208 if (!status) { 208 if (!status) {
209 printk("%s: could not allocate a buffer for switch " 209 printk(KERN_ERR "%s: could not allocate a buffer for "
210 "capabilities.\n", 210 "switch capabilities.\n", mmc_hostname(card->host));
211 mmc_hostname(card->host));
212 return err; 211 return err;
213 } 212 }
214 213
@@ -254,9 +253,8 @@ static int mmc_switch_hs(struct mmc_card *card)
254 253
255 status = kmalloc(64, GFP_KERNEL); 254 status = kmalloc(64, GFP_KERNEL);
256 if (!status) { 255 if (!status) {
257 printk("%s: could not allocate a buffer for switch " 256 printk(KERN_ERR "%s: could not allocate a buffer for "
258 "capabilities.\n", 257 "switch capabilities.\n", mmc_hostname(card->host));
259 mmc_hostname(card->host));
260 return err; 258 return err;
261 } 259 }
262 260