diff options
Diffstat (limited to 'drivers/usb/storage/realtek_cr.c')
-rw-r--r-- | drivers/usb/storage/realtek_cr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index 8623577bbbe7..281be56d5648 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
@@ -105,8 +105,9 @@ struct rts51x_chip { | |||
105 | int status_len; | 105 | int status_len; |
106 | 106 | ||
107 | u32 flag; | 107 | u32 flag; |
108 | #ifdef CONFIG_REALTEK_AUTOPM | ||
109 | struct us_data *us; | 108 | struct us_data *us; |
109 | |||
110 | #ifdef CONFIG_REALTEK_AUTOPM | ||
110 | struct timer_list rts51x_suspend_timer; | 111 | struct timer_list rts51x_suspend_timer; |
111 | unsigned long timer_expires; | 112 | unsigned long timer_expires; |
112 | int pwr_state; | 113 | int pwr_state; |
@@ -988,6 +989,7 @@ static int init_realtek_cr(struct us_data *us) | |||
988 | us->extra = chip; | 989 | us->extra = chip; |
989 | us->extra_destructor = realtek_cr_destructor; | 990 | us->extra_destructor = realtek_cr_destructor; |
990 | us->max_lun = chip->max_lun = rts51x_get_max_lun(us); | 991 | us->max_lun = chip->max_lun = rts51x_get_max_lun(us); |
992 | chip->us = us; | ||
991 | 993 | ||
992 | usb_stor_dbg(us, "chip->max_lun = %d\n", chip->max_lun); | 994 | usb_stor_dbg(us, "chip->max_lun = %d\n", chip->max_lun); |
993 | 995 | ||
@@ -1010,10 +1012,8 @@ static int init_realtek_cr(struct us_data *us) | |||
1010 | SET_AUTO_DELINK(chip); | 1012 | SET_AUTO_DELINK(chip); |
1011 | } | 1013 | } |
1012 | #ifdef CONFIG_REALTEK_AUTOPM | 1014 | #ifdef CONFIG_REALTEK_AUTOPM |
1013 | if (ss_en) { | 1015 | if (ss_en) |
1014 | chip->us = us; | ||
1015 | realtek_cr_autosuspend_setup(us); | 1016 | realtek_cr_autosuspend_setup(us); |
1016 | } | ||
1017 | #endif | 1017 | #endif |
1018 | 1018 | ||
1019 | usb_stor_dbg(us, "chip->flag = 0x%x\n", chip->flag); | 1019 | usb_stor_dbg(us, "chip->flag = 0x%x\n", chip->flag); |