diff options
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_proc.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_proc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c index e92991a7c485..f2525f8ed1c7 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_proc.c +++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c | |||
@@ -248,13 +248,13 @@ ahc_proc_write_seeprom(struct ahc_softc *ahc, char *buffer, int length) | |||
248 | ahc_pause(ahc); | 248 | ahc_pause(ahc); |
249 | 249 | ||
250 | if (length != sizeof(struct seeprom_config)) { | 250 | if (length != sizeof(struct seeprom_config)) { |
251 | printf("ahc_proc_write_seeprom: incorrect buffer size\n"); | 251 | printk("ahc_proc_write_seeprom: incorrect buffer size\n"); |
252 | goto done; | 252 | goto done; |
253 | } | 253 | } |
254 | 254 | ||
255 | have_seeprom = ahc_verify_cksum((struct seeprom_config*)buffer); | 255 | have_seeprom = ahc_verify_cksum((struct seeprom_config*)buffer); |
256 | if (have_seeprom == 0) { | 256 | if (have_seeprom == 0) { |
257 | printf("ahc_proc_write_seeprom: cksum verification failed\n"); | 257 | printk("ahc_proc_write_seeprom: cksum verification failed\n"); |
258 | goto done; | 258 | goto done; |
259 | } | 259 | } |
260 | 260 | ||
@@ -290,26 +290,25 @@ ahc_proc_write_seeprom(struct ahc_softc *ahc, char *buffer, int length) | |||
290 | sd.sd_DI = DI_2840; | 290 | sd.sd_DI = DI_2840; |
291 | have_seeprom = TRUE; | 291 | have_seeprom = TRUE; |
292 | } else { | 292 | } else { |
293 | printf("ahc_proc_write_seeprom: unsupported adapter type\n"); | 293 | printk("ahc_proc_write_seeprom: unsupported adapter type\n"); |
294 | goto done; | 294 | goto done; |
295 | } | 295 | } |
296 | 296 | ||
297 | if (!have_seeprom) { | 297 | if (!have_seeprom) { |
298 | printf("ahc_proc_write_seeprom: No Serial EEPROM\n"); | 298 | printk("ahc_proc_write_seeprom: No Serial EEPROM\n"); |
299 | goto done; | 299 | goto done; |
300 | } else { | 300 | } else { |
301 | u_int start_addr; | 301 | u_int start_addr; |
302 | 302 | ||
303 | if (ahc->seep_config == NULL) { | 303 | if (ahc->seep_config == NULL) { |
304 | ahc->seep_config = malloc(sizeof(*ahc->seep_config), | 304 | ahc->seep_config = kmalloc(sizeof(*ahc->seep_config), GFP_ATOMIC); |
305 | M_DEVBUF, M_NOWAIT); | ||
306 | if (ahc->seep_config == NULL) { | 305 | if (ahc->seep_config == NULL) { |
307 | printf("aic7xxx: Unable to allocate serial " | 306 | printk("aic7xxx: Unable to allocate serial " |
308 | "eeprom buffer. Write failing\n"); | 307 | "eeprom buffer. Write failing\n"); |
309 | goto done; | 308 | goto done; |
310 | } | 309 | } |
311 | } | 310 | } |
312 | printf("aic7xxx: Writing Serial EEPROM\n"); | 311 | printk("aic7xxx: Writing Serial EEPROM\n"); |
313 | start_addr = 32 * (ahc->channel - 'A'); | 312 | start_addr = 32 * (ahc->channel - 'A'); |
314 | ahc_write_seeprom(&sd, (u_int16_t *)buffer, start_addr, | 313 | ahc_write_seeprom(&sd, (u_int16_t *)buffer, start_addr, |
315 | sizeof(struct seeprom_config)/2); | 314 | sizeof(struct seeprom_config)/2); |