diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /drivers/usb/storage/sddr55.c | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/usb/storage/sddr55.c')
| -rw-r--r-- | drivers/usb/storage/sddr55.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c index d43a3415e12f..6d14327c921d 100644 --- a/drivers/usb/storage/sddr55.c +++ b/drivers/usb/storage/sddr55.c | |||
| @@ -522,8 +522,8 @@ int sddr55_reset(struct us_data *us) { | |||
| 522 | 522 | ||
| 523 | static unsigned long sddr55_get_capacity(struct us_data *us) { | 523 | static unsigned long sddr55_get_capacity(struct us_data *us) { |
| 524 | 524 | ||
| 525 | unsigned char manufacturerID; | 525 | unsigned char uninitialized_var(manufacturerID); |
| 526 | unsigned char deviceID; | 526 | unsigned char uninitialized_var(deviceID); |
| 527 | int result; | 527 | int result; |
| 528 | struct sddr55_card_info *info = (struct sddr55_card_info *)us->extra; | 528 | struct sddr55_card_info *info = (struct sddr55_card_info *)us->extra; |
| 529 | 529 | ||