aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-01-06 17:38:10 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:09:21 -0500
commit3e34c6dcb36bbd5294cae2654c32e24b9787da3a (patch)
tree9903b6b515b0497b60bae0886814cd9f5caca7e1
parent96c755a3923748313851da42018c962f5609942f (diff)
rt2x00: Fix chipset debugfs file
Initialize blob->data before moving the data pointer Initialize blob->size based on blob->data size This fixes the empty chipset file in debugfs. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00debug.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index e72c98133c05..c55bf0eea274 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -417,6 +417,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
417 if (!data) 417 if (!data)
418 return NULL; 418 return NULL;
419 419
420 blob->data = data;
420 data += sprintf(data, "rt chip: %04x\n", intf->rt2x00dev->chip.rt); 421 data += sprintf(data, "rt chip: %04x\n", intf->rt2x00dev->chip.rt);
421 data += sprintf(data, "rf chip: %04x\n", intf->rt2x00dev->chip.rf); 422 data += sprintf(data, "rf chip: %04x\n", intf->rt2x00dev->chip.rf);
422 data += sprintf(data, "revision:%08x\n", intf->rt2x00dev->chip.rev); 423 data += sprintf(data, "revision:%08x\n", intf->rt2x00dev->chip.rev);
@@ -425,9 +426,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
425 data += sprintf(data, "eeprom length: %d\n", debug->eeprom.word_count); 426 data += sprintf(data, "eeprom length: %d\n", debug->eeprom.word_count);
426 data += sprintf(data, "bbp length: %d\n", debug->bbp.word_count); 427 data += sprintf(data, "bbp length: %d\n", debug->bbp.word_count);
427 data += sprintf(data, "rf length: %d\n", debug->rf.word_count); 428 data += sprintf(data, "rf length: %d\n", debug->rf.word_count);
428 429 blob->size = strlen(blob->data);
429 blob->data = data;
430 blob->size = strlen(data);
431 430
432 return debugfs_create_blob(name, S_IRUGO, intf->driver_folder, blob); 431 return debugfs_create_blob(name, S_IRUGO, intf->driver_folder, blob);
433} 432}